diff --git a/toolchain/check/check.cpp b/toolchain/check/check.cpp index 07fb63a2d491..38c26989abd2 100644 --- a/toolchain/check/check.cpp +++ b/toolchain/check/check.cpp @@ -52,15 +52,25 @@ class SemIRLocationTranslator // If the parse node was invalid, recurse through import references when // possible. - auto import_ref = - cursor_ir->insts().TryGetAs(cursor_inst_id); - if (!import_ref) { - // Invalid parse node but not an import; just nothing to point at. - return GetLocationInFile(cursor_ir, Parse::NodeId::Invalid); + if (auto import_ref = cursor_ir->insts().TryGetAs( + cursor_inst_id)) { + cursor_ir = cursor_ir->cross_ref_irs().Get(import_ref->ir_id); + cursor_inst_id = import_ref->inst_id; + continue; } - cursor_ir = cursor_ir->cross_ref_irs().Get(import_ref->ir_id); - cursor_inst_id = import_ref->inst_id; + // If a namespace has an instruction for an import, switch to looking at + // it. + if (auto ns = + cursor_ir->insts().TryGetAs(cursor_inst_id)) { + if (ns->import_id.is_valid()) { + cursor_inst_id = ns->import_id; + continue; + } + } + + // Invalid parse node but not an import; just nothing to point at. + return GetLocationInFile(cursor_ir, Parse::NodeId::Invalid); } } @@ -139,13 +149,14 @@ static auto InitPackageScopeAndImports(Context& context, UnitInfo& unit_info) // Define the package scope, with an instruction for `package` expressions to // reference. auto package_scope_id = context.name_scopes().Add( - SemIR::InstId::PackageNamespace, SemIR::NameScopeId::Invalid); + SemIR::InstId::PackageNamespace, SemIR::NameId::PackageNamespace, + SemIR::NameScopeId::Invalid); CARBON_CHECK(package_scope_id == SemIR::NameScopeId::Package); auto package_inst_id = context.AddInst( {Parse::NodeId::Invalid, - SemIR::Namespace{namespace_type_id, SemIR::NameId::PackageNamespace, - SemIR::NameScopeId::Package}}); + SemIR::Namespace{namespace_type_id, SemIR::NameScopeId::Package, + SemIR::InstId::Invalid}}); CARBON_CHECK(package_inst_id == SemIR::InstId::PackageNamespace); // Add imports from the current package. diff --git a/toolchain/check/handle_class.cpp b/toolchain/check/handle_class.cpp index 862a2a97b79d..bc61b5a898bc 100644 --- a/toolchain/check/handle_class.cpp +++ b/toolchain/check/handle_class.cpp @@ -138,8 +138,8 @@ auto HandleClassDefinitionStart(Context& context, .Emit(); } else { class_info.definition_id = class_decl_id; - class_info.scope_id = - context.name_scopes().Add(class_decl_id, class_info.enclosing_scope_id); + class_info.scope_id = context.name_scopes().Add( + class_decl_id, SemIR::NameId::Invalid, class_info.enclosing_scope_id); } // Enter the class scope. diff --git a/toolchain/check/handle_interface.cpp b/toolchain/check/handle_interface.cpp index 0272574f26fe..8efa170cb9a7 100644 --- a/toolchain/check/handle_interface.cpp +++ b/toolchain/check/handle_interface.cpp @@ -118,8 +118,9 @@ auto HandleInterfaceDefinitionStart( .Emit(); } else { interface_info.definition_id = interface_decl_id; - interface_info.scope_id = context.name_scopes().Add( - interface_decl_id, interface_info.enclosing_scope_id); + interface_info.scope_id = + context.name_scopes().Add(interface_decl_id, SemIR::NameId::Invalid, + interface_info.enclosing_scope_id); } // Enter the interface scope. diff --git a/toolchain/check/handle_namespace.cpp b/toolchain/check/handle_namespace.cpp index 81739f89ef10..e002563a6cbc 100644 --- a/toolchain/check/handle_namespace.cpp +++ b/toolchain/check/handle_namespace.cpp @@ -23,10 +23,11 @@ auto HandleNamespace(Context& context, Parse::NamespaceId parse_node) -> bool { Lex::TokenKind::Namespace); auto namespace_inst = SemIR::Namespace{ context.GetBuiltinType(SemIR::BuiltinKind::NamespaceType), - name_context.name_id_for_new_inst(), SemIR::NameScopeId::Invalid}; + SemIR::NameScopeId::Invalid, SemIR::InstId::Invalid}; auto namespace_id = context.AddPlaceholderInst({parse_node, namespace_inst}); namespace_inst.name_scope_id = context.name_scopes().Add( - namespace_id, name_context.enclosing_scope_id_for_new_inst()); + namespace_id, name_context.name_id_for_new_inst(), + name_context.enclosing_scope_id_for_new_inst()); context.ReplaceInstBeforeConstantUse(namespace_id, {parse_node, namespace_inst}); context.decl_name_stack().AddNameToLookup(name_context, namespace_id); diff --git a/toolchain/check/import.cpp b/toolchain/check/import.cpp index 6b8ab3db31d6..bfb48a6eb6d7 100644 --- a/toolchain/check/import.cpp +++ b/toolchain/check/import.cpp @@ -35,10 +35,9 @@ static auto GetImportName(Parse::NodeId parse_node, Context& context, } case SemIR::InstKind::Namespace: { - auto namespace_inst = import_inst.As(); - const auto& scope = - import_sem_ir.name_scopes().Get(namespace_inst.name_scope_id); - return {namespace_inst.name_id, scope.enclosing_scope_id}; + const auto& scope = import_sem_ir.name_scopes().Get( + import_inst.As().name_scope_id); + return {scope.name_id, scope.enclosing_scope_id}; } default: @@ -78,6 +77,7 @@ static auto CacheCopiedNamespace( static auto CopySingleNameScopeFromImportIR( Context& context, llvm::DenseMap& copied_namespaces, + SemIR::CrossRefIRId ir_id, SemIR::InstId import_inst_id, SemIR::NameScopeId import_scope_id, SemIR::NameScopeId enclosing_scope_id, SemIR::NameId name_id, SemIR::TypeId namespace_type_id) -> SemIR::NameScopeId { @@ -94,14 +94,16 @@ static auto CopySingleNameScopeFromImportIR( } } - // Produce the namespace for the entry. Use the invalid node because there's - // no node to associate with. + // Produce the namespace for the entry. + auto ref_id = context.AddInst( + SemIR::LazyImportRef{.ir_id = ir_id, .inst_id = import_inst_id}); auto namespace_inst = - SemIR::Namespace{namespace_type_id, name_id, SemIR::NameScopeId::Invalid}; + SemIR::Namespace{namespace_type_id, SemIR::NameScopeId::Invalid, ref_id}; + // Use the invalid node because there's no node to associate with. auto namespace_id = context.AddPlaceholderInst({Parse::NodeId::Invalid, namespace_inst}); namespace_inst.name_scope_id = - context.name_scopes().Add(namespace_id, enclosing_scope_id); + context.name_scopes().Add(namespace_id, name_id, enclosing_scope_id); context.ReplaceInstBeforeConstantUse( namespace_id, {Parse::NodeId::Invalid, namespace_inst}); @@ -122,7 +124,7 @@ static auto CopySingleNameScopeFromImportIR( // import_enclosing_scope_id. static auto CopyEnclosingNameScopesFromImportIR( Context& context, SemIR::TypeId namespace_type_id, - const SemIR::File& import_sem_ir, + const SemIR::File& import_sem_ir, SemIR::CrossRefIRId ir_id, SemIR::NameScopeId import_enclosing_scope_id, llvm::DenseMap& copied_namespaces) -> SemIR::NameScopeId { @@ -136,8 +138,7 @@ static auto CopyEnclosingNameScopesFromImportIR( auto scope_cursor = SemIR::NameScopeId::Package; // Build a stack of enclosing namespace names, with innermost first. - llvm::SmallVector> - new_namespaces; + llvm::SmallVector new_namespaces; while (import_enclosing_scope_id != SemIR::NameScopeId::Package) { // If the namespace was already copied, reuse the results. if (auto it = copied_namespaces.find(import_enclosing_scope_id); @@ -153,17 +154,18 @@ static auto CopyEnclosingNameScopesFromImportIR( import_sem_ir.name_scopes().Get(import_enclosing_scope_id); auto scope_inst = import_sem_ir.insts().GetAs(scope.inst_id); - new_namespaces.push_back({scope_inst.name_scope_id, scope_inst.name_id}); + new_namespaces.push_back(scope_inst.name_scope_id); import_enclosing_scope_id = scope.enclosing_scope_id; } // Add enclosing namespace names, starting with the outermost. - for (auto import_namespace : llvm::reverse(new_namespaces)) { + for (auto import_scope_id : llvm::reverse(new_namespaces)) { + auto import_scope = import_sem_ir.name_scopes().Get(import_scope_id); auto name_id = - CopyNameFromImportIR(context, import_sem_ir, import_namespace.second); + CopyNameFromImportIR(context, import_sem_ir, import_scope.name_id); scope_cursor = CopySingleNameScopeFromImportIR( - context, copied_namespaces, import_namespace.first, scope_cursor, - name_id, namespace_type_id); + context, copied_namespaces, ir_id, import_scope.inst_id, + import_scope_id, scope_cursor, name_id, namespace_type_id); } return scope_cursor; @@ -189,15 +191,16 @@ auto Import(Context& context, SemIR::TypeId namespace_type_id, auto name_id = CopyNameFromImportIR(context, import_sem_ir, import_name_id); SemIR::NameScopeId enclosing_scope_id = CopyEnclosingNameScopesFromImportIR( - context, namespace_type_id, import_sem_ir, import_enclosing_scope_id, - copied_namespaces); + context, namespace_type_id, import_sem_ir, ir_id, + import_enclosing_scope_id, copied_namespaces); if (auto import_namespace_inst = import_inst.TryAs()) { // Namespaces are always imported because they're essential for // qualifiers, and the type is simple. CopySingleNameScopeFromImportIR( - context, copied_namespaces, import_namespace_inst->name_scope_id, - enclosing_scope_id, name_id, namespace_type_id); + context, copied_namespaces, ir_id, import_inst_id, + import_namespace_inst->name_scope_id, enclosing_scope_id, name_id, + namespace_type_id); } else { // Leave a placeholder that the inst comes from the other IR. auto target_id = context.AddPlaceholderInst( diff --git a/toolchain/check/testdata/array/array_in_place.carbon b/toolchain/check/testdata/array/array_in_place.carbon index 091f5761d0b3..8dea8d373641 100644 --- a/toolchain/check/testdata/array/array_in_place.carbon +++ b/toolchain/check/testdata/array/array_in_place.carbon @@ -25,7 +25,7 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/array_vs_tuple.carbon b/toolchain/check/testdata/array/array_vs_tuple.carbon index 9c1bf12e46c8..cabcb728391f 100644 --- a/toolchain/check/testdata/array/array_vs_tuple.carbon +++ b/toolchain/check/testdata/array/array_vs_tuple.carbon @@ -29,7 +29,7 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.G = %G} [template] +// CHECK:STDOUT: package: = namespace {.G = %G} [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/array/assign_return_value.carbon b/toolchain/check/testdata/array/assign_return_value.carbon index 2b8bb1eeb727..ef7c7586b92b 100644 --- a/toolchain/check/testdata/array/assign_return_value.carbon +++ b/toolchain/check/testdata/array/assign_return_value.carbon @@ -24,7 +24,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .Run = %Run} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %Run: = fn_decl @Run [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/assign_var.carbon b/toolchain/check/testdata/array/assign_var.carbon index 0e3784661073..a8927a5d64ce 100644 --- a/toolchain/check/testdata/array/assign_var.carbon +++ b/toolchain/check/testdata/array/assign_var.carbon @@ -25,7 +25,7 @@ var b: [i32; 3] = a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] // CHECK:STDOUT: %.loc7_22.1: (type, type, type) = tuple_literal (i32, i32, i32) // CHECK:STDOUT: %.loc7_22.2: type = converted %.loc7_22.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32, i32, i32) = var a diff --git a/toolchain/check/testdata/array/base.carbon b/toolchain/check/testdata/array/base.carbon index 0d7a730112cd..a709fe9aa858 100644 --- a/toolchain/check/testdata/array/base.carbon +++ b/toolchain/check/testdata/array/base.carbon @@ -38,7 +38,7 @@ var c: [(); 5] = ((), (), (), (), (),); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b, .c = %c} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c} [template] // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 1] = var a diff --git a/toolchain/check/testdata/array/fail_bound_overflow.carbon b/toolchain/check/testdata/array/fail_bound_overflow.carbon index e0c317c25595..3ac6e650c9f3 100644 --- a/toolchain/check/testdata/array/fail_bound_overflow.carbon +++ b/toolchain/check/testdata/array/fail_bound_overflow.carbon @@ -25,7 +25,7 @@ var b: [1; 39999999999999999993]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] // CHECK:STDOUT: %.loc10_14: i32 = int_literal 39999999999999999993 [template = constants.%.1] // CHECK:STDOUT: %.loc10_34: type = array_type %.loc10_14, i32 [template = ] // CHECK:STDOUT: %a.var: ref = var a diff --git a/toolchain/check/testdata/array/fail_incomplete_element.carbon b/toolchain/check/testdata/array/fail_incomplete_element.carbon index 155d6ae4a570..51dcdc1de524 100644 --- a/toolchain/check/testdata/array/fail_incomplete_element.carbon +++ b/toolchain/check/testdata/array/fail_incomplete_element.carbon @@ -31,7 +31,7 @@ var p: Incomplete* = &a[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Incomplete = %Incomplete.decl, .a = %a, .p = %p} [template] +// CHECK:STDOUT: package: = namespace {.Incomplete = %Incomplete.decl, .a = %a, .p = %p} [template] // CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete, () // CHECK:STDOUT: %Incomplete.ref.loc15: type = name_ref Incomplete, constants.%Incomplete [template = constants.%Incomplete] // CHECK:STDOUT: %.loc15_21: i32 = int_literal 1 [template = constants.%.1] diff --git a/toolchain/check/testdata/array/fail_invalid_type.carbon b/toolchain/check/testdata/array/fail_invalid_type.carbon index e71b75944b91..3a6ec54df69c 100644 --- a/toolchain/check/testdata/array/fail_invalid_type.carbon +++ b/toolchain/check/testdata/array/fail_invalid_type.carbon @@ -18,7 +18,7 @@ var a: [1; 1]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a} [template] +// CHECK:STDOUT: package: = namespace {.a = %a} [template] // CHECK:STDOUT: %.loc10_9: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc10_12: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc10_13: type = array_type %.loc10_12, [template = constants.%.2] diff --git a/toolchain/check/testdata/array/fail_out_of_bound.carbon b/toolchain/check/testdata/array/fail_out_of_bound.carbon index 5ef8d41e4fbf..d914a1b51113 100644 --- a/toolchain/check/testdata/array/fail_out_of_bound.carbon +++ b/toolchain/check/testdata/array/fail_out_of_bound.carbon @@ -21,7 +21,7 @@ var a: [i32; 1] = (1, 2, 3); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a} [template] +// CHECK:STDOUT: package: = namespace {.a = %a} [template] // CHECK:STDOUT: %.loc10_14: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 1] = var a diff --git a/toolchain/check/testdata/array/fail_out_of_bound_non_literal.carbon b/toolchain/check/testdata/array/fail_out_of_bound_non_literal.carbon index 74323938da5d..5fe7e10bfbc3 100644 --- a/toolchain/check/testdata/array/fail_out_of_bound_non_literal.carbon +++ b/toolchain/check/testdata/array/fail_out_of_bound_non_literal.carbon @@ -28,7 +28,7 @@ var b: i32 = a[{.index = 3}.index]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] // CHECK:STDOUT: %.loc7_14: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 3] = var a diff --git a/toolchain/check/testdata/array/fail_type_mismatch.carbon b/toolchain/check/testdata/array/fail_type_mismatch.carbon index bd3cd8ce4792..8691b1633fe6 100644 --- a/toolchain/check/testdata/array/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/array/fail_type_mismatch.carbon @@ -49,7 +49,7 @@ var d: [i32; 3] = t2; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .t1 = %t1, .b = %b, .c = %c, .t2 = %t2, .d = %d} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .t1 = %t1, .b = %b, .c = %c, .t2 = %t2, .d = %d} [template] // CHECK:STDOUT: %.loc10_14: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc10_15: type = array_type %.loc10_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 3] = var a diff --git a/toolchain/check/testdata/array/function_param.carbon b/toolchain/check/testdata/array/function_param.carbon index 67abb002a4c4..031511316d51 100644 --- a/toolchain/check/testdata/array/function_param.carbon +++ b/toolchain/check/testdata/array/function_param.carbon @@ -28,7 +28,7 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/array/index_not_literal.carbon b/toolchain/check/testdata/array/index_not_literal.carbon index f0cb24421f74..1ce7ff00cfe0 100644 --- a/toolchain/check/testdata/array/index_not_literal.carbon +++ b/toolchain/check/testdata/array/index_not_literal.carbon @@ -25,7 +25,7 @@ var b: i32 = a[{.index = 2}.index]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] // CHECK:STDOUT: %.loc7_14: i32 = int_literal 3 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 3] = var a diff --git a/toolchain/check/testdata/array/nine_elements.carbon b/toolchain/check/testdata/array/nine_elements.carbon index 48a429423748..f83c74d2bd26 100644 --- a/toolchain/check/testdata/array/nine_elements.carbon +++ b/toolchain/check/testdata/array/nine_elements.carbon @@ -34,7 +34,7 @@ var a: [i32; 9] = (1, 2, 3, 4, 5, 6, 7, 8, 9); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a} [template] +// CHECK:STDOUT: package: = namespace {.a = %a} [template] // CHECK:STDOUT: %.loc7_14: i32 = int_literal 9 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 9] = var a diff --git a/toolchain/check/testdata/as/as_type.carbon b/toolchain/check/testdata/as/as_type.carbon index 6f04da09a88c..32c70864e5a5 100644 --- a/toolchain/check/testdata/as/as_type.carbon +++ b/toolchain/check/testdata/as/as_type.carbon @@ -14,7 +14,7 @@ let t: type = (i32, i32) as type; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: %.loc7_24.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_24.2: type = converted %.loc7_24.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %t: type = bind_name t, %.loc7_24.2 diff --git a/toolchain/check/testdata/as/basic.carbon b/toolchain/check/testdata/as/basic.carbon index 7417d68eb23a..2c509a14652d 100644 --- a/toolchain/check/testdata/as/basic.carbon +++ b/toolchain/check/testdata/as/basic.carbon @@ -15,7 +15,7 @@ fn Main() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/as/fail_no_conversion.carbon b/toolchain/check/testdata/as/fail_no_conversion.carbon index f9d601eeaf93..f44be549ca81 100644 --- a/toolchain/check/testdata/as/fail_no_conversion.carbon +++ b/toolchain/check/testdata/as/fail_no_conversion.carbon @@ -19,7 +19,7 @@ let n: (i32, i32) = 1 as (i32, i32); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: %.loc10_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_17.2: type = converted %.loc10_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %.loc10_21: i32 = int_literal 1 [template = constants.%.4] diff --git a/toolchain/check/testdata/as/fail_not_type.carbon b/toolchain/check/testdata/as/fail_not_type.carbon index 6288ae5ce32a..32e6a527edad 100644 --- a/toolchain/check/testdata/as/fail_not_type.carbon +++ b/toolchain/check/testdata/as/fail_not_type.carbon @@ -17,7 +17,7 @@ let n: i32 = 1 as 2; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: %.loc10_14: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc10_19: i32 = int_literal 2 [template = constants.%.2] // CHECK:STDOUT: %n: i32 = bind_name n, diff --git a/toolchain/check/testdata/as/identity.carbon b/toolchain/check/testdata/as/identity.carbon index ba49d68e3438..871041e664cd 100644 --- a/toolchain/check/testdata/as/identity.carbon +++ b/toolchain/check/testdata/as/identity.carbon @@ -35,7 +35,7 @@ fn Initializing() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.X = %X.decl, .Value = %Value, .Reference = %Reference, .Make = %Make, .Initializing = %Initializing} [template] +// CHECK:STDOUT: package: = namespace {.X = %X.decl, .Value = %Value, .Reference = %Reference, .Make = %Make, .Initializing = %Initializing} [template] // CHECK:STDOUT: %X.decl = class_decl @X, () // CHECK:STDOUT: %Value: = fn_decl @Value [template] // CHECK:STDOUT: %Reference: = fn_decl @Reference [template] diff --git a/toolchain/check/testdata/as/tuple.carbon b/toolchain/check/testdata/as/tuple.carbon index 373ec05b15ea..388d4bf7b815 100644 --- a/toolchain/check/testdata/as/tuple.carbon +++ b/toolchain/check/testdata/as/tuple.carbon @@ -34,7 +34,7 @@ fn Var() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.X = %X.decl, .Make = %Make, .Let = %Let, .Var = %Var} [template] +// CHECK:STDOUT: package: = namespace {.X = %X.decl, .Make = %Make, .Let = %Let, .Var = %Var} [template] // CHECK:STDOUT: %X.decl = class_decl @X, () // CHECK:STDOUT: %Make: = fn_decl @Make [template] // CHECK:STDOUT: %Let: = fn_decl @Let [template] diff --git a/toolchain/check/testdata/basics/builtin_insts.carbon b/toolchain/check/testdata/basics/builtin_insts.carbon index e563f3955f7f..e981271a52a6 100644 --- a/toolchain/check/testdata/basics/builtin_insts.carbon +++ b/toolchain/check/testdata/basics/builtin_insts.carbon @@ -28,7 +28,7 @@ // CHECK:STDOUT: instFunctionType: {kind: CrossRef, arg0: ir0, arg1: instFunctionType, type: typeTypeType} // CHECK:STDOUT: instBoundMethodType: {kind: CrossRef, arg0: ir0, arg1: instBoundMethodType, type: typeTypeType} // CHECK:STDOUT: instNamespaceType: {kind: CrossRef, arg0: ir0, arg1: instNamespaceType, type: typeTypeType} -// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: namePackageNamespace, arg1: name_scope0, type: type0} +// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: name_scope0, arg1: inst, type: type0} // CHECK:STDOUT: constant_values: // CHECK:STDOUT: instTypeType: template instTypeType // CHECK:STDOUT: instError: template instError diff --git a/toolchain/check/testdata/basics/builtin_types.carbon b/toolchain/check/testdata/basics/builtin_types.carbon index 79a92177aadc..39d3b6438ac5 100644 --- a/toolchain/check/testdata/basics/builtin_types.carbon +++ b/toolchain/check/testdata/basics/builtin_types.carbon @@ -19,7 +19,7 @@ var test_type: type = i32; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.test_i32 = %test_i32, .test_f64 = %test_f64, .test_type = %test_type} [template] +// CHECK:STDOUT: package: = namespace {.test_i32 = %test_i32, .test_f64 = %test_f64, .test_type = %test_type} [template] // CHECK:STDOUT: %test_i32.var: ref i32 = var test_i32 // CHECK:STDOUT: %test_i32: ref i32 = bind_name test_i32, %test_i32.var // CHECK:STDOUT: %.loc7: i32 = int_literal 0 [template = constants.%.1] diff --git a/toolchain/check/testdata/basics/empty.carbon b/toolchain/check/testdata/basics/empty.carbon index 32413843f671..3fa678c1f66a 100644 --- a/toolchain/check/testdata/basics/empty.carbon +++ b/toolchain/check/testdata/basics/empty.carbon @@ -7,6 +7,6 @@ // CHECK:STDOUT: --- empty.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/empty_decl.carbon b/toolchain/check/testdata/basics/empty_decl.carbon index f631cc25672d..c881f3187f10 100644 --- a/toolchain/check/testdata/basics/empty_decl.carbon +++ b/toolchain/check/testdata/basics/empty_decl.carbon @@ -9,6 +9,6 @@ // CHECK:STDOUT: --- empty_decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/fail_bad_run.carbon b/toolchain/check/testdata/basics/fail_bad_run.carbon index 531fb957a72b..441aa607f359 100644 --- a/toolchain/check/testdata/basics/fail_bad_run.carbon +++ b/toolchain/check/testdata/basics/fail_bad_run.carbon @@ -20,7 +20,7 @@ fn Run() -> String {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Run = %Run} [template] +// CHECK:STDOUT: package: = namespace {.Run = %Run} [template] // CHECK:STDOUT: %Run: = fn_decl @Run [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/fail_bad_run_2.carbon b/toolchain/check/testdata/basics/fail_bad_run_2.carbon index 977e4f352eb1..013d0260fa8e 100644 --- a/toolchain/check/testdata/basics/fail_bad_run_2.carbon +++ b/toolchain/check/testdata/basics/fail_bad_run_2.carbon @@ -12,7 +12,7 @@ fn Run(n: i32) {} // CHECK:STDOUT: --- fail_bad_run_2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Run = %Run} [template] +// CHECK:STDOUT: package: = namespace {.Run = %Run} [template] // CHECK:STDOUT: %Run: = fn_decl @Run [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/fail_name_lookup.carbon b/toolchain/check/testdata/basics/fail_name_lookup.carbon index 75e2a1ba5f1d..2fd2d0701051 100644 --- a/toolchain/check/testdata/basics/fail_name_lookup.carbon +++ b/toolchain/check/testdata/basics/fail_name_lookup.carbon @@ -14,7 +14,7 @@ fn Main() { // CHECK:STDOUT: --- fail_name_lookup.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/fail_non_type_as_type.carbon b/toolchain/check/testdata/basics/fail_non_type_as_type.carbon index 9e59ace464c3..9c50bc9c25ac 100644 --- a/toolchain/check/testdata/basics/fail_non_type_as_type.carbon +++ b/toolchain/check/testdata/basics/fail_non_type_as_type.carbon @@ -16,7 +16,7 @@ var x: type = 42; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %x.var: ref type = var x // CHECK:STDOUT: %x: ref type = bind_name x, %x.var // CHECK:STDOUT: %.loc10: i32 = int_literal 42 [template = constants.%.1] diff --git a/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon b/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon index d56f9594c65e..e518be84d764 100644 --- a/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon +++ b/toolchain/check/testdata/basics/fail_qualifier_unsupported.carbon @@ -13,7 +13,7 @@ var y: i32 = x.b; // CHECK:STDOUT: --- fail_qualifier_unsupported.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %y.var: ref i32 = var y diff --git a/toolchain/check/testdata/basics/multifile.carbon b/toolchain/check/testdata/basics/multifile.carbon index 3b0db919d31d..9f2a26426879 100644 --- a/toolchain/check/testdata/basics/multifile.carbon +++ b/toolchain/check/testdata/basics/multifile.carbon @@ -17,7 +17,7 @@ fn B() {} // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A} [template] +// CHECK:STDOUT: package: = namespace {.A = %A} [template] // CHECK:STDOUT: %A: = fn_decl @A [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -29,7 +29,7 @@ fn B() {} // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.B = %B} [template] +// CHECK:STDOUT: package: = namespace {.B = %B} [template] // CHECK:STDOUT: %B: = fn_decl @B [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon b/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon index 3132830d1204..5fb7339ca210 100644 --- a/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon +++ b/toolchain/check/testdata/basics/multifile_raw_and_textual_ir.carbon @@ -33,7 +33,7 @@ fn B() {} // CHECK:STDOUT: type1: {inst: instFunctionType, value_rep: {kind: copy, type: type1}} // CHECK:STDOUT: type_blocks: {} // CHECK:STDOUT: insts: -// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: namePackageNamespace, arg1: name_scope0, type: type0} +// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: name_scope0, arg1: inst, type: type0} // CHECK:STDOUT: inst+1: {kind: FunctionDecl, arg0: function0, type: type1} // CHECK:STDOUT: inst+2: {kind: Return} // CHECK:STDOUT: constant_values: @@ -53,7 +53,7 @@ fn B() {} // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A} [template] +// CHECK:STDOUT: package: = namespace {.A = %A} [template] // CHECK:STDOUT: %A: = fn_decl @A [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -77,7 +77,7 @@ fn B() {} // CHECK:STDOUT: type1: {inst: instFunctionType, value_rep: {kind: copy, type: type1}} // CHECK:STDOUT: type_blocks: {} // CHECK:STDOUT: insts: -// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: namePackageNamespace, arg1: name_scope0, type: type0} +// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: name_scope0, arg1: inst, type: type0} // CHECK:STDOUT: inst+1: {kind: FunctionDecl, arg0: function0, type: type1} // CHECK:STDOUT: inst+2: {kind: Return} // CHECK:STDOUT: constant_values: @@ -97,7 +97,7 @@ fn B() {} // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.B = %B} [template] +// CHECK:STDOUT: package: = namespace {.B = %B} [template] // CHECK:STDOUT: %B: = fn_decl @B [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/multifile_raw_ir.carbon b/toolchain/check/testdata/basics/multifile_raw_ir.carbon index a32147b5fc34..e88704e4ec29 100644 --- a/toolchain/check/testdata/basics/multifile_raw_ir.carbon +++ b/toolchain/check/testdata/basics/multifile_raw_ir.carbon @@ -33,7 +33,7 @@ fn B() {} // CHECK:STDOUT: type1: {inst: instFunctionType, value_rep: {kind: copy, type: type1}} // CHECK:STDOUT: type_blocks: {} // CHECK:STDOUT: insts: -// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: namePackageNamespace, arg1: name_scope0, type: type0} +// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: name_scope0, arg1: inst, type: type0} // CHECK:STDOUT: inst+1: {kind: FunctionDecl, arg0: function0, type: type1} // CHECK:STDOUT: inst+2: {kind: Return} // CHECK:STDOUT: constant_values: @@ -64,7 +64,7 @@ fn B() {} // CHECK:STDOUT: type1: {inst: instFunctionType, value_rep: {kind: copy, type: type1}} // CHECK:STDOUT: type_blocks: {} // CHECK:STDOUT: insts: -// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: namePackageNamespace, arg1: name_scope0, type: type0} +// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: name_scope0, arg1: inst, type: type0} // CHECK:STDOUT: inst+1: {kind: FunctionDecl, arg0: function0, type: type1} // CHECK:STDOUT: inst+2: {kind: Return} // CHECK:STDOUT: constant_values: diff --git a/toolchain/check/testdata/basics/numeric_literals.carbon b/toolchain/check/testdata/basics/numeric_literals.carbon index 44199a02c11d..a77a84cdd29a 100644 --- a/toolchain/check/testdata/basics/numeric_literals.carbon +++ b/toolchain/check/testdata/basics/numeric_literals.carbon @@ -58,7 +58,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/parens.carbon b/toolchain/check/testdata/basics/parens.carbon index 6451249ed76f..bd6d6fc71a26 100644 --- a/toolchain/check/testdata/basics/parens.carbon +++ b/toolchain/check/testdata/basics/parens.carbon @@ -15,7 +15,7 @@ var b: i32 = ((2)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: %.loc7: i32 = int_literal 1 [template = constants.%.1] diff --git a/toolchain/check/testdata/basics/raw_and_textual_ir.carbon b/toolchain/check/testdata/basics/raw_and_textual_ir.carbon index 7b269a33e8d5..30cb4dc68032 100644 --- a/toolchain/check/testdata/basics/raw_and_textual_ir.carbon +++ b/toolchain/check/testdata/basics/raw_and_textual_ir.carbon @@ -45,7 +45,7 @@ fn Foo(n: i32) -> (i32, i32, f64) { // CHECK:STDOUT: 1: type1 // CHECK:STDOUT: 2: type3 // CHECK:STDOUT: insts: -// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: namePackageNamespace, arg1: name_scope0, type: type0} +// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: name_scope0, arg1: inst, type: type0} // CHECK:STDOUT: inst+1: {kind: Param, arg0: name1, type: type1} // CHECK:STDOUT: inst+2: {kind: BindName, arg0: bindName0, arg1: inst+1, type: type1} // CHECK:STDOUT: inst+3: {kind: TupleType, arg0: typeBlock0, type: typeTypeType} @@ -137,7 +137,7 @@ fn Foo(n: i32) -> (i32, i32, f64) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/raw_identifier.carbon b/toolchain/check/testdata/basics/raw_identifier.carbon index b70fa0862379..2543297df078 100644 --- a/toolchain/check/testdata/basics/raw_identifier.carbon +++ b/toolchain/check/testdata/basics/raw_identifier.carbon @@ -23,7 +23,7 @@ fn C(r#if: i32) -> i32 { // CHECK:STDOUT: --- raw_identifier.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A, .B = %B, .C = %C} [template] +// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .C = %C} [template] // CHECK:STDOUT: %A: = fn_decl @A [template] // CHECK:STDOUT: %B: = fn_decl @B [template] // CHECK:STDOUT: %C: = fn_decl @C [template] diff --git a/toolchain/check/testdata/basics/raw_ir.carbon b/toolchain/check/testdata/basics/raw_ir.carbon index aa4cd8ab4d91..9d9bc7897a96 100644 --- a/toolchain/check/testdata/basics/raw_ir.carbon +++ b/toolchain/check/testdata/basics/raw_ir.carbon @@ -45,7 +45,7 @@ fn Foo(n: i32) -> (i32, i32, f64) { // CHECK:STDOUT: 1: type1 // CHECK:STDOUT: 2: type3 // CHECK:STDOUT: insts: -// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: namePackageNamespace, arg1: name_scope0, type: type0} +// CHECK:STDOUT: inst+0: {kind: Namespace, arg0: name_scope0, arg1: inst, type: type0} // CHECK:STDOUT: inst+1: {kind: Param, arg0: name1, type: type1} // CHECK:STDOUT: inst+2: {kind: BindName, arg0: bindName0, arg1: inst+1, type: type1} // CHECK:STDOUT: inst+3: {kind: TupleType, arg0: typeBlock0, type: typeTypeType} diff --git a/toolchain/check/testdata/basics/run.carbon b/toolchain/check/testdata/basics/run.carbon index fcc3bbd8f7f0..503163937fb1 100644 --- a/toolchain/check/testdata/basics/run.carbon +++ b/toolchain/check/testdata/basics/run.carbon @@ -9,7 +9,7 @@ fn Run() {} // CHECK:STDOUT: --- run.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Run = %Run} [template] +// CHECK:STDOUT: package: = namespace {.Run = %Run} [template] // CHECK:STDOUT: %Run: = fn_decl @Run [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/run_i32.carbon b/toolchain/check/testdata/basics/run_i32.carbon index a7bb0dadb151..0fe7c0e2b053 100644 --- a/toolchain/check/testdata/basics/run_i32.carbon +++ b/toolchain/check/testdata/basics/run_i32.carbon @@ -13,7 +13,7 @@ fn Run() -> i32 { return 0; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Run = %Run} [template] +// CHECK:STDOUT: package: = namespace {.Run = %Run} [template] // CHECK:STDOUT: %Run: = fn_decl @Run [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/basics/textual_ir.carbon b/toolchain/check/testdata/basics/textual_ir.carbon index f0f0e13c4b75..840f8ab6f469 100644 --- a/toolchain/check/testdata/basics/textual_ir.carbon +++ b/toolchain/check/testdata/basics/textual_ir.carbon @@ -23,7 +23,7 @@ fn Foo(n: i32) -> (i32, i32, f64) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/base.carbon b/toolchain/check/testdata/class/base.carbon index 367c70a8ca45..36d89dc7fab6 100644 --- a/toolchain/check/testdata/class/base.carbon +++ b/toolchain/check/testdata/class/base.carbon @@ -47,7 +47,7 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Base = %Base.decl, .Derived = %Derived.decl, .Make = %Make, .Access = %Access} [template] +// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl, .Make = %Make, .Access = %Access} [template] // CHECK:STDOUT: %Base.decl = class_decl @Base, () // CHECK:STDOUT: %Derived.decl = class_decl @Derived, () // CHECK:STDOUT: %Make: = fn_decl @Make [template] diff --git a/toolchain/check/testdata/class/base_field.carbon b/toolchain/check/testdata/class/base_field.carbon index 98bc00e3e533..c1d8657534a3 100644 --- a/toolchain/check/testdata/class/base_field.carbon +++ b/toolchain/check/testdata/class/base_field.carbon @@ -40,7 +40,7 @@ fn Access(p: Derived*) -> i32* { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Base = %Base.decl, .Derived = %Derived.decl, .Access = %Access} [template] +// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl, .Access = %Access} [template] // CHECK:STDOUT: %Base.decl = class_decl @Base, () // CHECK:STDOUT: %Derived.decl = class_decl @Derived, () // CHECK:STDOUT: %Access: = fn_decl @Access [template] diff --git a/toolchain/check/testdata/class/base_function_unqualified.carbon b/toolchain/check/testdata/class/base_function_unqualified.carbon index 596cd08d1643..9b18975aa252 100644 --- a/toolchain/check/testdata/class/base_function_unqualified.carbon +++ b/toolchain/check/testdata/class/base_function_unqualified.carbon @@ -32,7 +32,7 @@ fn Derived.H() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Base = %Base.decl, .Derived = %Derived.decl} [template] +// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl} [template] // CHECK:STDOUT: %Base.decl = class_decl @Base, () // CHECK:STDOUT: %Derived.decl = class_decl @Derived, () // CHECK:STDOUT: %H: = fn_decl @H [template] diff --git a/toolchain/check/testdata/class/base_method.carbon b/toolchain/check/testdata/class/base_method.carbon index c64b540b1cb8..8aeba55b81ec 100644 --- a/toolchain/check/testdata/class/base_method.carbon +++ b/toolchain/check/testdata/class/base_method.carbon @@ -41,7 +41,7 @@ fn Call(p: Derived*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Base = %Base.decl, .Derived = %Derived.decl, .Call = %Call} [template] +// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl, .Call = %Call} [template] // CHECK:STDOUT: %Base.decl = class_decl @Base, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %Derived.decl = class_decl @Derived, () diff --git a/toolchain/check/testdata/class/base_method_shadow.carbon b/toolchain/check/testdata/class/base_method_shadow.carbon index d31cf48652ed..4cbd97689e0b 100644 --- a/toolchain/check/testdata/class/base_method_shadow.carbon +++ b/toolchain/check/testdata/class/base_method_shadow.carbon @@ -55,7 +55,7 @@ fn Call(a: A*, b: B*, c: C*, d: D*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A.decl, .B = %B.decl, .C = %C.decl, .D = %D.decl, .Call = %Call} [template] +// CHECK:STDOUT: package: = namespace {.A = %A.decl, .B = %B.decl, .C = %C.decl, .D = %D.decl, .Call = %Call} [template] // CHECK:STDOUT: %A.decl = class_decl @A, () // CHECK:STDOUT: %B.decl = class_decl @B, () // CHECK:STDOUT: %C.decl = class_decl @C, () diff --git a/toolchain/check/testdata/class/basic.carbon b/toolchain/check/testdata/class/basic.carbon index ea4a31cc46ed..2d20cd6636ca 100644 --- a/toolchain/check/testdata/class/basic.carbon +++ b/toolchain/check/testdata/class/basic.carbon @@ -32,7 +32,7 @@ fn Run() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Run = %Run} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: %Run: = fn_decl @Run [template] diff --git a/toolchain/check/testdata/class/derived_to_base.carbon b/toolchain/check/testdata/class/derived_to_base.carbon index 2500bbfa3592..7cea89eb5422 100644 --- a/toolchain/check/testdata/class/derived_to_base.carbon +++ b/toolchain/check/testdata/class/derived_to_base.carbon @@ -69,7 +69,7 @@ fn ConvertInit() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A.decl, .B = %B.decl, .C = %C.decl, .ConvertCToB = %ConvertCToB, .ConvertBToA = %ConvertBToA, .ConvertCToA = %ConvertCToA, .ConvertValue = %ConvertValue, .ConvertRef = %ConvertRef, .ConvertInit = %ConvertInit} [template] +// CHECK:STDOUT: package: = namespace {.A = %A.decl, .B = %B.decl, .C = %C.decl, .ConvertCToB = %ConvertCToB, .ConvertBToA = %ConvertBToA, .ConvertCToA = %ConvertCToA, .ConvertValue = %ConvertValue, .ConvertRef = %ConvertRef, .ConvertInit = %ConvertInit} [template] // CHECK:STDOUT: %A.decl = class_decl @A, () // CHECK:STDOUT: %B.decl = class_decl @B, () // CHECK:STDOUT: %C.decl = class_decl @C, () diff --git a/toolchain/check/testdata/class/fail_abstract.carbon b/toolchain/check/testdata/class/fail_abstract.carbon index 7c5c5fb8e8d8..bfef274dc1e4 100644 --- a/toolchain/check/testdata/class/fail_abstract.carbon +++ b/toolchain/check/testdata/class/fail_abstract.carbon @@ -49,7 +49,7 @@ fn Access(d: Derived) -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Abstract = %Abstract.decl, .Derived = %Derived.decl, .Make = %Make, .Access = %Access} [template] +// CHECK:STDOUT: package: = namespace {.Abstract = %Abstract.decl, .Derived = %Derived.decl, .Make = %Make, .Access = %Access} [template] // CHECK:STDOUT: %Abstract.decl = class_decl @Abstract, () // CHECK:STDOUT: %Derived.decl = class_decl @Derived, () // CHECK:STDOUT: %Make: = fn_decl @Make [template] diff --git a/toolchain/check/testdata/class/fail_addr_not_self.carbon b/toolchain/check/testdata/class/fail_addr_not_self.carbon index c67f041a9c8d..bb15eff187ef 100644 --- a/toolchain/check/testdata/class/fail_addr_not_self.carbon +++ b/toolchain/check/testdata/class/fail_addr_not_self.carbon @@ -25,7 +25,7 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_addr_self.carbon b/toolchain/check/testdata/class/fail_addr_self.carbon index 4f11d1e04b4e..b37889616877 100644 --- a/toolchain/check/testdata/class/fail_addr_self.carbon +++ b/toolchain/check/testdata/class/fail_addr_self.carbon @@ -49,7 +49,7 @@ fn F(c: Class, p: Class*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %F: = fn_decl @F.2 [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_base_bad_type.carbon b/toolchain/check/testdata/class/fail_base_bad_type.carbon index aed2d91a5746..a306674ef929 100644 --- a/toolchain/check/testdata/class/fail_base_bad_type.carbon +++ b/toolchain/check/testdata/class/fail_base_bad_type.carbon @@ -168,7 +168,7 @@ fn AccessMemberWithInvalidBaseFinal_NoMember(p: DeriveFromFinal*) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Base = %Base.decl, .Final = %Final.decl, .DeriveFromError = %DeriveFromError.decl, .AccessMemberWithInvalidBaseError = %AccessMemberWithInvalidBaseError, .DeriveFromNonType = %DeriveFromNonType.decl, .AccessMemberWithInvalidBasNonType = %AccessMemberWithInvalidBasNonType, .DeriveFromi32 = %DeriveFromi32.decl, .ConvertToBadBasei32 = %ConvertToBadBasei32, .AccessMemberWithInvalidBasei32 = %AccessMemberWithInvalidBasei32, .DeriveFromTuple = %DeriveFromTuple.decl, .ConvertToBadBaseTuple = %ConvertToBadBaseTuple, .AccessMemberWithInvalidBaseTuple = %AccessMemberWithInvalidBaseTuple, .DeriveFromStruct = %DeriveFromStruct.decl, .ConvertToBadBaseStruct = %ConvertToBadBaseStruct, .AccessMemberWithInvalidBaseStruct = %AccessMemberWithInvalidBaseStruct, .Incomplete = %Incomplete.decl, .DeriveFromIncomplete = %DeriveFromIncomplete.decl, .ConvertToBadBaseIncomplete = %ConvertToBadBaseIncomplete, .AccessMemberWithInvalidBaseIncomplete = %AccessMemberWithInvalidBaseIncomplete, .DeriveFromFinal = %DeriveFromFinal.decl, .ConvertToBadBaseFinal = %ConvertToBadBaseFinal, .AccessMemberWithInvalidBaseFinal_WithMember = %AccessMemberWithInvalidBaseFinal_WithMember, .AccessMemberWithInvalidBaseFinal_NoMember = %AccessMemberWithInvalidBaseFinal_NoMember} [template] +// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Final = %Final.decl, .DeriveFromError = %DeriveFromError.decl, .AccessMemberWithInvalidBaseError = %AccessMemberWithInvalidBaseError, .DeriveFromNonType = %DeriveFromNonType.decl, .AccessMemberWithInvalidBasNonType = %AccessMemberWithInvalidBasNonType, .DeriveFromi32 = %DeriveFromi32.decl, .ConvertToBadBasei32 = %ConvertToBadBasei32, .AccessMemberWithInvalidBasei32 = %AccessMemberWithInvalidBasei32, .DeriveFromTuple = %DeriveFromTuple.decl, .ConvertToBadBaseTuple = %ConvertToBadBaseTuple, .AccessMemberWithInvalidBaseTuple = %AccessMemberWithInvalidBaseTuple, .DeriveFromStruct = %DeriveFromStruct.decl, .ConvertToBadBaseStruct = %ConvertToBadBaseStruct, .AccessMemberWithInvalidBaseStruct = %AccessMemberWithInvalidBaseStruct, .Incomplete = %Incomplete.decl, .DeriveFromIncomplete = %DeriveFromIncomplete.decl, .ConvertToBadBaseIncomplete = %ConvertToBadBaseIncomplete, .AccessMemberWithInvalidBaseIncomplete = %AccessMemberWithInvalidBaseIncomplete, .DeriveFromFinal = %DeriveFromFinal.decl, .ConvertToBadBaseFinal = %ConvertToBadBaseFinal, .AccessMemberWithInvalidBaseFinal_WithMember = %AccessMemberWithInvalidBaseFinal_WithMember, .AccessMemberWithInvalidBaseFinal_NoMember = %AccessMemberWithInvalidBaseFinal_NoMember} [template] // CHECK:STDOUT: %Base.decl = class_decl @Base, () // CHECK:STDOUT: %Final.decl = class_decl @Final, () // CHECK:STDOUT: %DeriveFromError.decl = class_decl @DeriveFromError, () diff --git a/toolchain/check/testdata/class/fail_base_method_define.carbon b/toolchain/check/testdata/class/fail_base_method_define.carbon index 0634f7fb528b..37e39b6a79ac 100644 --- a/toolchain/check/testdata/class/fail_base_method_define.carbon +++ b/toolchain/check/testdata/class/fail_base_method_define.carbon @@ -40,7 +40,7 @@ fn D.C.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.B = %B.decl, .D = %D.decl} [template] +// CHECK:STDOUT: package: = namespace {.B = %B.decl, .D = %D.decl} [template] // CHECK:STDOUT: %B.decl = class_decl @B, () // CHECK:STDOUT: %D.decl = class_decl @D, () // CHECK:STDOUT: %F: = fn_decl @F.3 [template] diff --git a/toolchain/check/testdata/class/fail_base_modifiers.carbon b/toolchain/check/testdata/class/fail_base_modifiers.carbon index 5620cfe06bc1..a1c97ca448f7 100644 --- a/toolchain/check/testdata/class/fail_base_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_base_modifiers.carbon @@ -62,7 +62,7 @@ class C4 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.B = %B.decl, .C1 = %C1.decl, .C2 = %C2.decl, .C3 = %C3.decl, .C4 = %C4.decl} [template] +// CHECK:STDOUT: package: = namespace {.B = %B.decl, .C1 = %C1.decl, .C2 = %C2.decl, .C3 = %C3.decl, .C4 = %C4.decl} [template] // CHECK:STDOUT: %B.decl = class_decl @B, () // CHECK:STDOUT: %C1.decl = class_decl @C1, () // CHECK:STDOUT: %C2.decl = class_decl @C2, () diff --git a/toolchain/check/testdata/class/fail_base_no_extend.carbon b/toolchain/check/testdata/class/fail_base_no_extend.carbon index 51b99631632d..71dca8b509f4 100644 --- a/toolchain/check/testdata/class/fail_base_no_extend.carbon +++ b/toolchain/check/testdata/class/fail_base_no_extend.carbon @@ -26,7 +26,7 @@ class C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.B = %B.decl, .C = %C.decl} [template] +// CHECK:STDOUT: package: = namespace {.B = %B.decl, .C = %C.decl} [template] // CHECK:STDOUT: %B.decl = class_decl @B, () // CHECK:STDOUT: %C.decl = class_decl @C, () // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_base_repeated.carbon b/toolchain/check/testdata/class/fail_base_repeated.carbon index 2192572e127f..7151c4b3c092 100644 --- a/toolchain/check/testdata/class/fail_base_repeated.carbon +++ b/toolchain/check/testdata/class/fail_base_repeated.carbon @@ -46,7 +46,7 @@ class D { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.B1 = %B1.decl, .B2 = %B2.decl, .C = %C.decl, .D = %D.decl} [template] +// CHECK:STDOUT: package: = namespace {.B1 = %B1.decl, .B2 = %B2.decl, .C = %C.decl, .D = %D.decl} [template] // CHECK:STDOUT: %B1.decl = class_decl @B1, () // CHECK:STDOUT: %B2.decl = class_decl @B2, () // CHECK:STDOUT: %C.decl = class_decl @C, () diff --git a/toolchain/check/testdata/class/fail_base_unbound.carbon b/toolchain/check/testdata/class/fail_base_unbound.carbon index 18124606e5a4..b4ba5bdc3b95 100644 --- a/toolchain/check/testdata/class/fail_base_unbound.carbon +++ b/toolchain/check/testdata/class/fail_base_unbound.carbon @@ -28,7 +28,7 @@ let b: B = C.base; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.B = %B.decl, .C = %C.decl} [template] +// CHECK:STDOUT: package: = namespace {.B = %B.decl, .C = %C.decl} [template] // CHECK:STDOUT: %B.decl = class_decl @B, () // CHECK:STDOUT: %C.decl = class_decl @C, () // CHECK:STDOUT: %B.ref: type = name_ref B, constants.%B [template = constants.%B] diff --git a/toolchain/check/testdata/class/fail_derived_to_base.carbon b/toolchain/check/testdata/class/fail_derived_to_base.carbon index 693cfd240dbc..f4f2c4ca864e 100644 --- a/toolchain/check/testdata/class/fail_derived_to_base.carbon +++ b/toolchain/check/testdata/class/fail_derived_to_base.carbon @@ -53,7 +53,7 @@ fn ConvertIncomplete(p: Incomplete*) -> A2* { return p; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A1 = %A1.decl, .A2 = %A2.decl, .B2 = %B2.decl, .ConvertUnrelated = %ConvertUnrelated, .Incomplete = %Incomplete.decl, .ConvertIncomplete = %ConvertIncomplete} [template] +// CHECK:STDOUT: package: = namespace {.A1 = %A1.decl, .A2 = %A2.decl, .B2 = %B2.decl, .ConvertUnrelated = %ConvertUnrelated, .Incomplete = %Incomplete.decl, .ConvertIncomplete = %ConvertIncomplete} [template] // CHECK:STDOUT: %A1.decl = class_decl @A1, () // CHECK:STDOUT: %A2.decl = class_decl @A2, () // CHECK:STDOUT: %B2.decl = class_decl @B2, () diff --git a/toolchain/check/testdata/class/fail_field_modifiers.carbon b/toolchain/check/testdata/class/fail_field_modifiers.carbon index 1cecf949e86f..1f1f133f8d8a 100644 --- a/toolchain/check/testdata/class/fail_field_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_field_modifiers.carbon @@ -38,7 +38,7 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_incomplete.carbon b/toolchain/check/testdata/class/fail_incomplete.carbon index 918231a26bb0..21d5cb17528d 100644 --- a/toolchain/check/testdata/class/fail_incomplete.carbon +++ b/toolchain/check/testdata/class/fail_incomplete.carbon @@ -125,7 +125,7 @@ fn CallReturnIncomplete() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .CallClassFunction = %CallClassFunction, .global_var = %global_var, .ConvertFromStruct = %ConvertFromStruct, .MemberAccess = %MemberAccess, .Copy = %Copy, .Let = %Let, .TakeIncomplete = %TakeIncomplete, .ReturnIncomplete = %ReturnIncomplete, .CallTakeIncomplete = %CallTakeIncomplete, .CallReturnIncomplete = %CallReturnIncomplete} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .CallClassFunction = %CallClassFunction, .global_var = %global_var, .ConvertFromStruct = %ConvertFromStruct, .MemberAccess = %MemberAccess, .Copy = %Copy, .Let = %Let, .TakeIncomplete = %TakeIncomplete, .ReturnIncomplete = %ReturnIncomplete, .CallTakeIncomplete = %CallTakeIncomplete, .CallReturnIncomplete = %CallReturnIncomplete} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %.loc15: = fn_decl @.1 [template] // CHECK:STDOUT: %CallClassFunction: = fn_decl @CallClassFunction [template] diff --git a/toolchain/check/testdata/class/fail_init.carbon b/toolchain/check/testdata/class/fail_init.carbon index 44da2521bfa2..cef4f072e1d1 100644 --- a/toolchain/check/testdata/class/fail_init.carbon +++ b/toolchain/check/testdata/class/fail_init.carbon @@ -40,7 +40,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_init_as_inplace.carbon b/toolchain/check/testdata/class/fail_init_as_inplace.carbon index 09c2430d6ba0..0a72ae7caadf 100644 --- a/toolchain/check/testdata/class/fail_init_as_inplace.carbon +++ b/toolchain/check/testdata/class/fail_init_as_inplace.carbon @@ -37,7 +37,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .G = %G, .F = %F} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .G = %G, .F = %F} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: %F: = fn_decl @F [template] diff --git a/toolchain/check/testdata/class/fail_memaccess_category.carbon b/toolchain/check/testdata/class/fail_memaccess_category.carbon index 8093897715a9..9207fcff3bd8 100644 --- a/toolchain/check/testdata/class/fail_memaccess_category.carbon +++ b/toolchain/check/testdata/class/fail_memaccess_category.carbon @@ -49,7 +49,7 @@ fn F(s: {.a: A}, b: B) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A.decl, .B = %B.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace {.A = %A.decl, .B = %B.decl, .F = %F} [template] // CHECK:STDOUT: %A.decl = class_decl @A, () // CHECK:STDOUT: %B.decl = class_decl @B, () // CHECK:STDOUT: %F: = fn_decl @F.2 [template] diff --git a/toolchain/check/testdata/class/fail_member_of_let.carbon b/toolchain/check/testdata/class/fail_member_of_let.carbon index a43ad84f5ec5..47fbe6ea4b1b 100644 --- a/toolchain/check/testdata/class/fail_member_of_let.carbon +++ b/toolchain/check/testdata/class/fail_member_of_let.carbon @@ -26,7 +26,7 @@ fn T.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Class.ref: type = name_ref Class, constants.%Class [template = constants.%Class] // CHECK:STDOUT: %T: type = bind_name T, %Class.ref diff --git a/toolchain/check/testdata/class/fail_method.carbon b/toolchain/check/testdata/class/fail_method.carbon index 13bc41be8031..8fa9f185d42e 100644 --- a/toolchain/check/testdata/class/fail_method.carbon +++ b/toolchain/check/testdata/class/fail_method.carbon @@ -40,7 +40,7 @@ fn F(c: Class) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_method_modifiers.carbon b/toolchain/check/testdata/class/fail_method_modifiers.carbon index 05891020fa1e..4396057d894c 100644 --- a/toolchain/check/testdata/class/fail_method_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_method_modifiers.carbon @@ -57,7 +57,7 @@ base class BaseClass { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.FinalClass = %FinalClass.decl, .AbstractClass = %AbstractClass.decl, .BaseClass = %BaseClass.decl} [template] +// CHECK:STDOUT: package: = namespace {.FinalClass = %FinalClass.decl, .AbstractClass = %AbstractClass.decl, .BaseClass = %BaseClass.decl} [template] // CHECK:STDOUT: %FinalClass.decl = class_decl @FinalClass, () // CHECK:STDOUT: %AbstractClass.decl = class_decl @AbstractClass, () // CHECK:STDOUT: %BaseClass.decl = class_decl @BaseClass, () diff --git a/toolchain/check/testdata/class/fail_modifiers.carbon b/toolchain/check/testdata/class/fail_modifiers.carbon index 8d77fe4c76fe..c7dfd7b7a882 100644 --- a/toolchain/check/testdata/class/fail_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_modifiers.carbon @@ -77,7 +77,7 @@ abstract base class AbstractAndBase {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.DuplicatePrivate = %DuplicatePrivate.decl, .TwoAccess = %TwoAccess.decl, .TwoAbstract = %TwoAbstract.decl, .Virtual = %Virtual.decl, .WrongOrder = %WrongOrder.decl, .AbstractAndBase = %AbstractAndBase.decl} [template] +// CHECK:STDOUT: package: = namespace {.DuplicatePrivate = %DuplicatePrivate.decl, .TwoAccess = %TwoAccess.decl, .TwoAbstract = %TwoAbstract.decl, .Virtual = %Virtual.decl, .WrongOrder = %WrongOrder.decl, .AbstractAndBase = %AbstractAndBase.decl} [template] // CHECK:STDOUT: %DuplicatePrivate.decl = class_decl @DuplicatePrivate, () // CHECK:STDOUT: %TwoAccess.decl = class_decl @TwoAccess, () // CHECK:STDOUT: %TwoAbstract.decl = class_decl @TwoAbstract, () diff --git a/toolchain/check/testdata/class/fail_out_of_line_decl.carbon b/toolchain/check/testdata/class/fail_out_of_line_decl.carbon index f2540b0b5241..a9f7a024c7eb 100644 --- a/toolchain/check/testdata/class/fail_out_of_line_decl.carbon +++ b/toolchain/check/testdata/class/fail_out_of_line_decl.carbon @@ -19,7 +19,7 @@ fn C.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.C = %C.decl} [template] +// CHECK:STDOUT: package: = namespace {.C = %C.decl} [template] // CHECK:STDOUT: %C.decl = class_decl @C, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon b/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon index 405ec3827050..953dbd914d79 100644 --- a/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon +++ b/toolchain/check/testdata/class/fail_redeclaration_introducer.carbon @@ -88,7 +88,7 @@ base class G; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A.decl.loc7, .B = %B.decl.loc16, .C = %C.decl.loc25, .D = %D.decl.loc34, .E = %E.decl.loc43, .F = %F.decl.loc52, .G = %G.decl.loc61} [template] +// CHECK:STDOUT: package: = namespace {.A = %A.decl.loc7, .B = %B.decl.loc16, .C = %C.decl.loc25, .D = %D.decl.loc34, .E = %E.decl.loc43, .F = %F.decl.loc52, .G = %G.decl.loc61} [template] // CHECK:STDOUT: %A.decl.loc7 = class_decl @A, () // CHECK:STDOUT: %A.decl.loc14 = class_decl @A, () // CHECK:STDOUT: %B.decl.loc16 = class_decl @B, () diff --git a/toolchain/check/testdata/class/fail_redeclaration_scope.carbon b/toolchain/check/testdata/class/fail_redeclaration_scope.carbon index b7663d12ef97..d51286d70aa3 100644 --- a/toolchain/check/testdata/class/fail_redeclaration_scope.carbon +++ b/toolchain/check/testdata/class/fail_redeclaration_scope.carbon @@ -35,7 +35,7 @@ class Y { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A.decl.loc7, .X = %X.decl, .Y = %Y.decl} [template] +// CHECK:STDOUT: package: = namespace {.A = %A.decl.loc7, .X = %X.decl, .Y = %Y.decl} [template] // CHECK:STDOUT: %A.decl.loc7 = class_decl @A.1, () // CHECK:STDOUT: %X.decl = class_decl @X, () // CHECK:STDOUT: %A.decl.loc15 = class_decl @A.1, () diff --git a/toolchain/check/testdata/class/fail_redefinition.carbon b/toolchain/check/testdata/class/fail_redefinition.carbon index e7cfecde3dc9..4033a3cde245 100644 --- a/toolchain/check/testdata/class/fail_redefinition.carbon +++ b/toolchain/check/testdata/class/fail_redefinition.carbon @@ -32,7 +32,7 @@ fn Class.H() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl.loc7} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl.loc7} [template] // CHECK:STDOUT: %Class.decl.loc7 = class_decl @Class, () // CHECK:STDOUT: %Class.decl.loc18 = class_decl @Class, () // CHECK:STDOUT: %F: = fn_decl @F [template] diff --git a/toolchain/check/testdata/class/fail_reorder.carbon b/toolchain/check/testdata/class/fail_reorder.carbon index 2a623cb32768..62f27daebbfe 100644 --- a/toolchain/check/testdata/class/fail_reorder.carbon +++ b/toolchain/check/testdata/class/fail_reorder.carbon @@ -34,7 +34,7 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_scope.carbon b/toolchain/check/testdata/class/fail_scope.carbon index 9710955f0414..bcd28ba77117 100644 --- a/toolchain/check/testdata/class/fail_scope.carbon +++ b/toolchain/check/testdata/class/fail_scope.carbon @@ -26,7 +26,7 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .G = %G} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .G = %G} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_self.carbon b/toolchain/check/testdata/class/fail_self.carbon index 1459c0479579..5a24a7477699 100644 --- a/toolchain/check/testdata/class/fail_self.carbon +++ b/toolchain/check/testdata/class/fail_self.carbon @@ -61,7 +61,7 @@ fn CallWrongSelf(ws: WrongSelf) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .WrongSelf = %WrongSelf.decl, .CallWrongSelf = %CallWrongSelf} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .WrongSelf = %WrongSelf.decl, .CallWrongSelf = %CallWrongSelf} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %F: = fn_decl @F.1 [template] // CHECK:STDOUT: %G: = fn_decl @G [template] diff --git a/toolchain/check/testdata/class/fail_todo_generic.carbon b/toolchain/check/testdata/class/fail_todo_generic.carbon index 28eba40d162d..5587854859e4 100644 --- a/toolchain/check/testdata/class/fail_todo_generic.carbon +++ b/toolchain/check/testdata/class/fail_todo_generic.carbon @@ -19,7 +19,7 @@ class C[](); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.C = %C.decl} [template] +// CHECK:STDOUT: package: = namespace {.C = %C.decl} [template] // CHECK:STDOUT: %C.decl = class_decl @C, () // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/fail_todo_modifiers.carbon b/toolchain/check/testdata/class/fail_todo_modifiers.carbon index d5b6180c993a..29b6855d58ff 100644 --- a/toolchain/check/testdata/class/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/class/fail_todo_modifiers.carbon @@ -70,7 +70,7 @@ abstract class Abstract { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Access = %Access.decl, .Base = %Base.decl, .Abstract = %Abstract.decl} [template] +// CHECK:STDOUT: package: = namespace {.Access = %Access.decl, .Base = %Base.decl, .Abstract = %Abstract.decl} [template] // CHECK:STDOUT: %Access.decl = class_decl @Access, () // CHECK:STDOUT: %Base.decl = class_decl @Base, () // CHECK:STDOUT: %Abstract.decl = class_decl @Abstract, () diff --git a/toolchain/check/testdata/class/fail_unbound_field.carbon b/toolchain/check/testdata/class/fail_unbound_field.carbon index 23a5638518cf..3ed8f1a62cd7 100644 --- a/toolchain/check/testdata/class/fail_unbound_field.carbon +++ b/toolchain/check/testdata/class/fail_unbound_field.carbon @@ -30,7 +30,7 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .G = %G} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .G = %G} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/fail_unknown_member.carbon b/toolchain/check/testdata/class/fail_unknown_member.carbon index 7399a8d9f808..9688ef4c4d7f 100644 --- a/toolchain/check/testdata/class/fail_unknown_member.carbon +++ b/toolchain/check/testdata/class/fail_unknown_member.carbon @@ -26,7 +26,7 @@ fn G(c: Class) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .G = %G} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .G = %G} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/field_access.carbon b/toolchain/check/testdata/class/field_access.carbon index b904f82e5439..d601a84bccc6 100644 --- a/toolchain/check/testdata/class/field_access.carbon +++ b/toolchain/check/testdata/class/field_access.carbon @@ -29,7 +29,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Run = %Run} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Run: = fn_decl @Run [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/field_access_in_value.carbon b/toolchain/check/testdata/class/field_access_in_value.carbon index 8051fadb06ca..e1b62f21d0f8 100644 --- a/toolchain/check/testdata/class/field_access_in_value.carbon +++ b/toolchain/check/testdata/class/field_access_in_value.carbon @@ -30,7 +30,7 @@ fn Test() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .Test = %Test} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Test = %Test} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Test: = fn_decl @Test [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/forward_declared.carbon b/toolchain/check/testdata/class/forward_declared.carbon index 16004120d54c..73d506055b4e 100644 --- a/toolchain/check/testdata/class/forward_declared.carbon +++ b/toolchain/check/testdata/class/forward_declared.carbon @@ -16,7 +16,7 @@ fn F(p: Class*) -> Class* { return p; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/init.carbon b/toolchain/check/testdata/class/init.carbon index 3b1cb20bf7e1..1cf1e841ee68 100644 --- a/toolchain/check/testdata/class/init.carbon +++ b/toolchain/check/testdata/class/init.carbon @@ -30,7 +30,7 @@ fn MakeReorder(n: i32, next: Class*) -> Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .Make = %Make, .MakeReorder = %MakeReorder} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Make = %Make, .MakeReorder = %MakeReorder} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Make: = fn_decl @Make [template] // CHECK:STDOUT: %MakeReorder: = fn_decl @MakeReorder [template] diff --git a/toolchain/check/testdata/class/init_as.carbon b/toolchain/check/testdata/class/init_as.carbon index 42641851c0d0..d368312221ce 100644 --- a/toolchain/check/testdata/class/init_as.carbon +++ b/toolchain/check/testdata/class/init_as.carbon @@ -26,7 +26,7 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/init_nested.carbon b/toolchain/check/testdata/class/init_nested.carbon index 24ac9a517abd..d1bd1c28a58b 100644 --- a/toolchain/check/testdata/class/init_nested.carbon +++ b/toolchain/check/testdata/class/init_nested.carbon @@ -36,7 +36,7 @@ fn MakeOuter() -> Outer { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Inner = %Inner.decl, .MakeInner = %MakeInner, .Outer = %Outer.decl, .MakeOuter = %MakeOuter} [template] +// CHECK:STDOUT: package: = namespace {.Inner = %Inner.decl, .MakeInner = %MakeInner, .Outer = %Outer.decl, .MakeOuter = %MakeOuter} [template] // CHECK:STDOUT: %Inner.decl = class_decl @Inner, () // CHECK:STDOUT: %MakeInner: = fn_decl @MakeInner [template] // CHECK:STDOUT: %Outer.decl = class_decl @Outer, () diff --git a/toolchain/check/testdata/class/method.carbon b/toolchain/check/testdata/class/method.carbon index 9bd7a14ba7e2..45781d19d83d 100644 --- a/toolchain/check/testdata/class/method.carbon +++ b/toolchain/check/testdata/class/method.carbon @@ -61,7 +61,7 @@ fn CallGOnInitializingExpr() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .Call = %Call, .CallOnConstBoundMethod = %CallOnConstBoundMethod, .CallWithAddr = %CallWithAddr, .CallFThroughPointer = %CallFThroughPointer, .CallGThroughPointer = %CallGThroughPointer, .Make = %Make, .CallFOnInitializingExpr = %CallFOnInitializingExpr, .CallGOnInitializingExpr = %CallGOnInitializingExpr} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Call = %Call, .CallOnConstBoundMethod = %CallOnConstBoundMethod, .CallWithAddr = %CallWithAddr, .CallFThroughPointer = %CallFThroughPointer, .CallGThroughPointer = %CallGThroughPointer, .Make = %Make, .CallFOnInitializingExpr = %CallFOnInitializingExpr, .CallGOnInitializingExpr = %CallGOnInitializingExpr} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %Call: = fn_decl @Call [template] diff --git a/toolchain/check/testdata/class/nested.carbon b/toolchain/check/testdata/class/nested.carbon index f2fde56bbbd9..52716650aa5f 100644 --- a/toolchain/check/testdata/class/nested.carbon +++ b/toolchain/check/testdata/class/nested.carbon @@ -46,7 +46,7 @@ fn F(a: Outer*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Outer = %Outer.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace {.Outer = %Outer.decl, .F = %F} [template] // CHECK:STDOUT: %Outer.decl = class_decl @Outer, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/nested_name.carbon b/toolchain/check/testdata/class/nested_name.carbon index 24d93ed11e5d..817e64e2a46b 100644 --- a/toolchain/check/testdata/class/nested_name.carbon +++ b/toolchain/check/testdata/class/nested_name.carbon @@ -32,7 +32,7 @@ fn G(o: Outer) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Outer = %Outer.decl, .F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace {.Outer = %Outer.decl, .F = %F, .G = %G} [template] // CHECK:STDOUT: %Outer.decl = class_decl @Outer, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] diff --git a/toolchain/check/testdata/class/raw_self.carbon b/toolchain/check/testdata/class/raw_self.carbon index d706c8e2e655..1434bb824339 100644 --- a/toolchain/check/testdata/class/raw_self.carbon +++ b/toolchain/check/testdata/class/raw_self.carbon @@ -32,7 +32,7 @@ fn Class.G[self: Class](r#self: i32) -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] diff --git a/toolchain/check/testdata/class/raw_self_type.carbon b/toolchain/check/testdata/class/raw_self_type.carbon index eb6f3c7a2b23..863353445310 100644 --- a/toolchain/check/testdata/class/raw_self_type.carbon +++ b/toolchain/check/testdata/class/raw_self_type.carbon @@ -20,7 +20,7 @@ class Class { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/class/redeclaration.carbon b/toolchain/check/testdata/class/redeclaration.carbon index ba0b08741e71..002a0b7fd894 100644 --- a/toolchain/check/testdata/class/redeclaration.carbon +++ b/toolchain/check/testdata/class/redeclaration.carbon @@ -20,7 +20,7 @@ fn Class.F() {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl.loc7} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl.loc7} [template] // CHECK:STDOUT: %Class.decl.loc7 = class_decl @Class, () // CHECK:STDOUT: %Class.decl.loc9 = class_decl @Class, () // CHECK:STDOUT: %F: = fn_decl @F [template] diff --git a/toolchain/check/testdata/class/redeclaration_introducer.carbon b/toolchain/check/testdata/class/redeclaration_introducer.carbon index a323c1585198..5103c8af2e6e 100644 --- a/toolchain/check/testdata/class/redeclaration_introducer.carbon +++ b/toolchain/check/testdata/class/redeclaration_introducer.carbon @@ -22,7 +22,7 @@ abstract class C {} // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A.decl.loc7, .B = %B.decl.loc8, .C = %C.decl.loc9} [template] +// CHECK:STDOUT: package: = namespace {.A = %A.decl.loc7, .B = %B.decl.loc8, .C = %C.decl.loc9} [template] // CHECK:STDOUT: %A.decl.loc7 = class_decl @A, () // CHECK:STDOUT: %B.decl.loc8 = class_decl @B, () // CHECK:STDOUT: %C.decl.loc9 = class_decl @C, () diff --git a/toolchain/check/testdata/class/reenter_scope.carbon b/toolchain/check/testdata/class/reenter_scope.carbon index 8c9211a86d66..73c034da3a89 100644 --- a/toolchain/check/testdata/class/reenter_scope.carbon +++ b/toolchain/check/testdata/class/reenter_scope.carbon @@ -21,7 +21,7 @@ fn Class.F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/scope.carbon b/toolchain/check/testdata/class/scope.carbon index 91d06e559ecf..a88b1880a260 100644 --- a/toolchain/check/testdata/class/scope.carbon +++ b/toolchain/check/testdata/class/scope.carbon @@ -33,7 +33,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .F = %F, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .F = %F, .Run = %Run} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %F: = fn_decl @F.2 [template] // CHECK:STDOUT: %Run: = fn_decl @Run [template] diff --git a/toolchain/check/testdata/class/self.carbon b/toolchain/check/testdata/class/self.carbon index 0936d8d11fe3..99d453f33210 100644 --- a/toolchain/check/testdata/class/self.carbon +++ b/toolchain/check/testdata/class/self.carbon @@ -30,7 +30,7 @@ fn Class.G[addr self: Class*]() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] diff --git a/toolchain/check/testdata/class/self_conversion.carbon b/toolchain/check/testdata/class/self_conversion.carbon index 0ba43d9f2c9f..b62ab3918962 100644 --- a/toolchain/check/testdata/class/self_conversion.carbon +++ b/toolchain/check/testdata/class/self_conversion.carbon @@ -47,7 +47,7 @@ fn Call(p: Derived*) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Base = %Base.decl, .Derived = %Derived.decl, .Call = %Call} [template] +// CHECK:STDOUT: package: = namespace {.Base = %Base.decl, .Derived = %Derived.decl, .Call = %Call} [template] // CHECK:STDOUT: %Base.decl = class_decl @Base, () // CHECK:STDOUT: %Derived.decl = class_decl @Derived, () // CHECK:STDOUT: %SelfBase: = fn_decl @SelfBase [template] diff --git a/toolchain/check/testdata/class/self_type.carbon b/toolchain/check/testdata/class/self_type.carbon index 2453c53e670f..1afe06c5d498 100644 --- a/toolchain/check/testdata/class/self_type.carbon +++ b/toolchain/check/testdata/class/self_type.carbon @@ -27,7 +27,7 @@ fn Class.F[self: Class]() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/class/static_method.carbon b/toolchain/check/testdata/class/static_method.carbon index 3759b8cd0368..42cf817ae50e 100644 --- a/toolchain/check/testdata/class/static_method.carbon +++ b/toolchain/check/testdata/class/static_method.carbon @@ -23,7 +23,7 @@ fn Run() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Class = %Class.decl, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace {.Class = %Class.decl, .Run = %Run} [template] // CHECK:STDOUT: %Class.decl = class_decl @Class, () // CHECK:STDOUT: %Run: = fn_decl @Run [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/const/collapse.carbon b/toolchain/check/testdata/const/collapse.carbon index 7387db293eef..b18d77089aa9 100644 --- a/toolchain/check/testdata/const/collapse.carbon +++ b/toolchain/check/testdata/const/collapse.carbon @@ -21,7 +21,7 @@ fn F(p: const i32**) -> const (const i32)** { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/const/fail_collapse.carbon b/toolchain/check/testdata/const/fail_collapse.carbon index 6e59bebc4c7c..88f99d46e22e 100644 --- a/toolchain/check/testdata/const/fail_collapse.carbon +++ b/toolchain/check/testdata/const/fail_collapse.carbon @@ -25,7 +25,7 @@ fn G(p: const (const i32)**) -> i32** { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.G = %G} [template] +// CHECK:STDOUT: package: = namespace {.G = %G} [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/eval/aggregate.carbon b/toolchain/check/testdata/eval/aggregate.carbon index 39ec54032b4a..084c523df197 100644 --- a/toolchain/check/testdata/eval/aggregate.carbon +++ b/toolchain/check/testdata/eval/aggregate.carbon @@ -47,7 +47,7 @@ var struct_access: [i32; 1] = (0,) as [i32; {.a = 3, .b = 1}.b]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.tuple_copy = %tuple_copy, .struct_copy = %struct_copy, .tuple_index = %tuple_index, .struct_access = %struct_access} [template] +// CHECK:STDOUT: package: = namespace {.tuple_copy = %tuple_copy, .struct_copy = %struct_copy, .tuple_index = %tuple_index, .struct_access = %struct_access} [template] // CHECK:STDOUT: %.loc7_26.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_26.2: type = converted %.loc7_26.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %tuple_copy.var: ref (i32, i32) = var tuple_copy diff --git a/toolchain/check/testdata/eval/fail_aggregate.carbon b/toolchain/check/testdata/eval/fail_aggregate.carbon index 8ea5f97ea1ae..554d1e59c3a9 100644 --- a/toolchain/check/testdata/eval/fail_aggregate.carbon +++ b/toolchain/check/testdata/eval/fail_aggregate.carbon @@ -35,7 +35,7 @@ var array_index: [i32; 1] = (0,) as [i32; ((5, 7, 1, 9) as [i32; 4])[2]]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.array_index = %array_index} [template] +// CHECK:STDOUT: package: = namespace {.array_index = %array_index} [template] // CHECK:STDOUT: %.loc12_24: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc12_25: type = array_type %.loc12_24, i32 [template = constants.%.2] // CHECK:STDOUT: %array_index.var: ref [i32; 1] = var array_index diff --git a/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon b/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon index 9105dfda63a7..882520eee776 100644 --- a/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon +++ b/toolchain/check/testdata/expr_category/in_place_tuple_init.carbon @@ -26,7 +26,7 @@ fn H() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G, .H = %H} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .H = %H} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: %H: = fn_decl @H [template] diff --git a/toolchain/check/testdata/function/call/empty_struct.carbon b/toolchain/check/testdata/function/call/empty_struct.carbon index bf9c8c4fefd3..c299802ec13d 100644 --- a/toolchain/check/testdata/function/call/empty_struct.carbon +++ b/toolchain/check/testdata/function/call/empty_struct.carbon @@ -21,7 +21,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Echo = %Echo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Echo = %Echo, .Main = %Main} [template] // CHECK:STDOUT: %Echo: = fn_decl @Echo [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/empty_tuple.carbon b/toolchain/check/testdata/function/call/empty_tuple.carbon index ac687a1edc77..02d1b6017cf2 100644 --- a/toolchain/check/testdata/function/call/empty_tuple.carbon +++ b/toolchain/check/testdata/function/call/empty_tuple.carbon @@ -20,7 +20,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Echo = %Echo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Echo = %Echo, .Main = %Main} [template] // CHECK:STDOUT: %Echo: = fn_decl @Echo [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/fail_not_callable.carbon b/toolchain/check/testdata/function/call/fail_not_callable.carbon index 82bdbe5d8440..7dd0ac5cefff 100644 --- a/toolchain/check/testdata/function/call/fail_not_callable.carbon +++ b/toolchain/check/testdata/function/call/fail_not_callable.carbon @@ -19,7 +19,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Run = %Run} [template] +// CHECK:STDOUT: package: = namespace {.Run = %Run} [template] // CHECK:STDOUT: %Run: = fn_decl @Run [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/call/fail_param_count.carbon b/toolchain/check/testdata/function/call/fail_param_count.carbon index a99a7a959e68..5ec03ae49fa2 100644 --- a/toolchain/check/testdata/function/call/fail_param_count.carbon +++ b/toolchain/check/testdata/function/call/fail_param_count.carbon @@ -64,7 +64,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Run0 = %Run0, .Run1 = %Run1, .Run2 = %Run2, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Run0 = %Run0, .Run1 = %Run1, .Run2 = %Run2, .Main = %Main} [template] // CHECK:STDOUT: %Run0: = fn_decl @Run0 [template] // CHECK:STDOUT: %Run1: = fn_decl @Run1 [template] // CHECK:STDOUT: %Run2: = fn_decl @Run2 [template] diff --git a/toolchain/check/testdata/function/call/fail_param_type.carbon b/toolchain/check/testdata/function/call/fail_param_type.carbon index bfe72e3075b3..94065890ba09 100644 --- a/toolchain/check/testdata/function/call/fail_param_type.carbon +++ b/toolchain/check/testdata/function/call/fail_param_type.carbon @@ -24,7 +24,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.G = %G, .F = %F} [template] +// CHECK:STDOUT: package: = namespace {.G = %G, .F = %F} [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon index 93d26e7fbf81..359e7e7cb72b 100644 --- a/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon +++ b/toolchain/check/testdata/function/call/fail_return_type_mismatch.carbon @@ -20,7 +20,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Run = %Run} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: %Run: = fn_decl @Run [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/i32.carbon b/toolchain/check/testdata/function/call/i32.carbon index 5a7395a53e1b..55dfb439586e 100644 --- a/toolchain/check/testdata/function/call/i32.carbon +++ b/toolchain/check/testdata/function/call/i32.carbon @@ -19,7 +19,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Echo = %Echo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Echo = %Echo, .Main = %Main} [template] // CHECK:STDOUT: %Echo: = fn_decl @Echo [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/more_param_ir.carbon b/toolchain/check/testdata/function/call/more_param_ir.carbon index 574447a5633a..76b3b0275457 100644 --- a/toolchain/check/testdata/function/call/more_param_ir.carbon +++ b/toolchain/check/testdata/function/call/more_param_ir.carbon @@ -25,7 +25,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_one.carbon b/toolchain/check/testdata/function/call/params_one.carbon index 636bfc233995..7b7f8ed4c71c 100644 --- a/toolchain/check/testdata/function/call/params_one.carbon +++ b/toolchain/check/testdata/function/call/params_one.carbon @@ -18,7 +18,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_one_comma.carbon b/toolchain/check/testdata/function/call/params_one_comma.carbon index 0993666fd705..c31039879e8d 100644 --- a/toolchain/check/testdata/function/call/params_one_comma.carbon +++ b/toolchain/check/testdata/function/call/params_one_comma.carbon @@ -19,7 +19,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_two.carbon b/toolchain/check/testdata/function/call/params_two.carbon index cf89d47c6a3e..e1ab67b39779 100644 --- a/toolchain/check/testdata/function/call/params_two.carbon +++ b/toolchain/check/testdata/function/call/params_two.carbon @@ -19,7 +19,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_two_comma.carbon b/toolchain/check/testdata/function/call/params_two_comma.carbon index 815e05e818a9..e955aaebbf84 100644 --- a/toolchain/check/testdata/function/call/params_two_comma.carbon +++ b/toolchain/check/testdata/function/call/params_two_comma.carbon @@ -20,7 +20,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/params_zero.carbon b/toolchain/check/testdata/function/call/params_zero.carbon index 75c984926aaf..af52c15f199c 100644 --- a/toolchain/check/testdata/function/call/params_zero.carbon +++ b/toolchain/check/testdata/function/call/params_zero.carbon @@ -17,7 +17,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Main = %Main} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/call/return_implicit.carbon b/toolchain/check/testdata/function/call/return_implicit.carbon index 6b37a78aa884..cbb70d3a30a6 100644 --- a/toolchain/check/testdata/function/call/return_implicit.carbon +++ b/toolchain/check/testdata/function/call/return_implicit.carbon @@ -18,7 +18,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.MakeImplicitEmptyTuple = %MakeImplicitEmptyTuple, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.MakeImplicitEmptyTuple = %MakeImplicitEmptyTuple, .Main = %Main} [template] // CHECK:STDOUT: %MakeImplicitEmptyTuple: = fn_decl @MakeImplicitEmptyTuple [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/declaration/fail_modifiers.carbon b/toolchain/check/testdata/function/declaration/fail_modifiers.carbon index db037bfbf2cd..0bce4e39555f 100644 --- a/toolchain/check/testdata/function/declaration/fail_modifiers.carbon +++ b/toolchain/check/testdata/function/declaration/fail_modifiers.carbon @@ -73,7 +73,7 @@ default final virtual fn ModifiersConflict2() {} // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.WrongOrder = %WrongOrder, .DuplicateVirtual = %DuplicateVirtual, .TwoAccess = %TwoAccess, .ModifiersConflict = %ModifiersConflict, .InvalidModifier = %InvalidModifier, .ModifiersConflict2 = %ModifiersConflict2} [template] +// CHECK:STDOUT: package: = namespace {.WrongOrder = %WrongOrder, .DuplicateVirtual = %DuplicateVirtual, .TwoAccess = %TwoAccess, .ModifiersConflict = %ModifiersConflict, .InvalidModifier = %InvalidModifier, .ModifiersConflict2 = %ModifiersConflict2} [template] // CHECK:STDOUT: %WrongOrder: = fn_decl @WrongOrder [template] // CHECK:STDOUT: %DuplicateVirtual: = fn_decl @DuplicateVirtual [template] // CHECK:STDOUT: %TwoAccess: = fn_decl @TwoAccess [template] diff --git a/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon b/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon index 56e79ff256e8..e059a76065ab 100644 --- a/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/function/declaration/fail_todo_modifiers.carbon @@ -12,7 +12,7 @@ private fn F(); // CHECK:STDOUT: --- fail_todo_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/declaration/simple.carbon b/toolchain/check/testdata/function/declaration/simple.carbon index 8c9e6147ff18..f38034c96d4f 100644 --- a/toolchain/check/testdata/function/declaration/simple.carbon +++ b/toolchain/check/testdata/function/declaration/simple.carbon @@ -15,7 +15,7 @@ fn G() { F(); } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon b/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon index c1586b0ae1c7..786ca52a8b74 100644 --- a/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon +++ b/toolchain/check/testdata/function/definition/fail_param_name_conflict.carbon @@ -15,7 +15,7 @@ fn Bar(a: i32, a: i32) {} // CHECK:STDOUT: --- fail_param_name_conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Bar = %Bar} [template] +// CHECK:STDOUT: package: = namespace {.Bar = %Bar} [template] // CHECK:STDOUT: %Bar: = fn_decl @Bar [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/order.carbon b/toolchain/check/testdata/function/definition/order.carbon index 9f5a612a4cb4..3ac587d6c280 100644 --- a/toolchain/check/testdata/function/definition/order.carbon +++ b/toolchain/check/testdata/function/definition/order.carbon @@ -11,7 +11,7 @@ fn Baz() {} // CHECK:STDOUT: --- order.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Bar = %Bar, .Baz = %Baz} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Bar = %Bar, .Baz = %Baz} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: %Bar: = fn_decl @Bar [template] // CHECK:STDOUT: %Baz: = fn_decl @Baz [template] diff --git a/toolchain/check/testdata/function/definition/params_one.carbon b/toolchain/check/testdata/function/definition/params_one.carbon index 82ff8f55a3eb..6b3f7c0aac57 100644 --- a/toolchain/check/testdata/function/definition/params_one.carbon +++ b/toolchain/check/testdata/function/definition/params_one.carbon @@ -9,7 +9,7 @@ fn Foo(a: i32) {} // CHECK:STDOUT: --- params_one.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_one_comma.carbon b/toolchain/check/testdata/function/definition/params_one_comma.carbon index a5129640fd8e..6cfa090d070d 100644 --- a/toolchain/check/testdata/function/definition/params_one_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_one_comma.carbon @@ -9,7 +9,7 @@ fn Foo(a: i32,) {} // CHECK:STDOUT: --- params_one_comma.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_two.carbon b/toolchain/check/testdata/function/definition/params_two.carbon index 512ec0b33929..b1ebb8d07e57 100644 --- a/toolchain/check/testdata/function/definition/params_two.carbon +++ b/toolchain/check/testdata/function/definition/params_two.carbon @@ -9,7 +9,7 @@ fn Foo(a: i32, b: i32) {} // CHECK:STDOUT: --- params_two.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_two_comma.carbon b/toolchain/check/testdata/function/definition/params_two_comma.carbon index 7c1db37a64d8..b476f1a48e23 100644 --- a/toolchain/check/testdata/function/definition/params_two_comma.carbon +++ b/toolchain/check/testdata/function/definition/params_two_comma.carbon @@ -9,7 +9,7 @@ fn Foo(a: i32, b: i32,) {} // CHECK:STDOUT: --- params_two_comma.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/params_zero.carbon b/toolchain/check/testdata/function/definition/params_zero.carbon index 4a1c09814653..7c321a8cbfab 100644 --- a/toolchain/check/testdata/function/definition/params_zero.carbon +++ b/toolchain/check/testdata/function/definition/params_zero.carbon @@ -9,7 +9,7 @@ fn Foo() {} // CHECK:STDOUT: --- params_zero.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/definition/same_param_name.carbon b/toolchain/check/testdata/function/definition/same_param_name.carbon index f418c00cd2e5..4813622bec7e 100644 --- a/toolchain/check/testdata/function/definition/same_param_name.carbon +++ b/toolchain/check/testdata/function/definition/same_param_name.carbon @@ -10,7 +10,7 @@ fn Bar(a: i32) {} // CHECK:STDOUT: --- same_param_name.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo, .Bar = %Bar} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo, .Bar = %Bar} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: %Bar: = fn_decl @Bar [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon b/toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon index 71301ec3590a..2ad1b73ea53c 100644 --- a/toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon +++ b/toolchain/check/testdata/function/generic/fail_type_param_mismatch.carbon @@ -19,7 +19,7 @@ fn F(T:! type, U:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/function/generic/type_param.carbon b/toolchain/check/testdata/function/generic/type_param.carbon index 57aff347cfee..cda173b3391a 100644 --- a/toolchain/check/testdata/function/generic/type_param.carbon +++ b/toolchain/check/testdata/function/generic/type_param.carbon @@ -16,7 +16,7 @@ fn F(T:! type) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if/else.carbon b/toolchain/check/testdata/if/else.carbon index ab8a2ec37582..1eca654c7583 100644 --- a/toolchain/check/testdata/if/else.carbon +++ b/toolchain/check/testdata/if/else.carbon @@ -24,7 +24,7 @@ fn If(b: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G, .H = %H, .If = %If} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .H = %H, .If = %If} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: %H: = fn_decl @H [template] diff --git a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon index e3f9820c4449..0e8cc0c1bad2 100644 --- a/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/fail_reachable_fallthrough.carbon @@ -41,7 +41,7 @@ fn If3(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.If1 = %If1, .If2 = %If2, .If3 = %If3} [template] +// CHECK:STDOUT: package: = namespace {.If1 = %If1, .If2 = %If2, .If3 = %If3} [template] // CHECK:STDOUT: %If1: = fn_decl @If1 [template] // CHECK:STDOUT: %If2: = fn_decl @If2 [template] // CHECK:STDOUT: %If3: = fn_decl @If3 [template] diff --git a/toolchain/check/testdata/if/fail_scope.carbon b/toolchain/check/testdata/if/fail_scope.carbon index f5620bb536d9..0d27489e835f 100644 --- a/toolchain/check/testdata/if/fail_scope.carbon +++ b/toolchain/check/testdata/if/fail_scope.carbon @@ -22,7 +22,7 @@ fn VarScope(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.VarScope = %VarScope} [template] +// CHECK:STDOUT: package: = namespace {.VarScope = %VarScope} [template] // CHECK:STDOUT: %VarScope: = fn_decl @VarScope [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if/no_else.carbon b/toolchain/check/testdata/if/no_else.carbon index 1a1d11d5c8b7..ab9176abc6cf 100644 --- a/toolchain/check/testdata/if/no_else.carbon +++ b/toolchain/check/testdata/if/no_else.carbon @@ -21,7 +21,7 @@ fn If(b: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G, .If = %If} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .If = %If} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: %If: = fn_decl @If [template] diff --git a/toolchain/check/testdata/if/unreachable_fallthrough.carbon b/toolchain/check/testdata/if/unreachable_fallthrough.carbon index e757c298f9d5..4b3f022d6645 100644 --- a/toolchain/check/testdata/if/unreachable_fallthrough.carbon +++ b/toolchain/check/testdata/if/unreachable_fallthrough.carbon @@ -21,7 +21,7 @@ fn If(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.If = %If} [template] +// CHECK:STDOUT: package: = namespace {.If = %If} [template] // CHECK:STDOUT: %If: = fn_decl @If [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/basic.carbon b/toolchain/check/testdata/if_expr/basic.carbon index 8fb9e8cecbb1..d01c4d881558 100644 --- a/toolchain/check/testdata/if_expr/basic.carbon +++ b/toolchain/check/testdata/if_expr/basic.carbon @@ -22,7 +22,7 @@ fn F(b: bool, n: i32, m: i32) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/constant_condition.carbon b/toolchain/check/testdata/if_expr/constant_condition.carbon index 071cee3e8da4..e95dade0a25d 100644 --- a/toolchain/check/testdata/if_expr/constant_condition.carbon +++ b/toolchain/check/testdata/if_expr/constant_condition.carbon @@ -25,7 +25,7 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A, .B = %B, .F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .F = %F, .G = %G} [template] // CHECK:STDOUT: %A: = fn_decl @A [template] // CHECK:STDOUT: %B: = fn_decl @B [template] // CHECK:STDOUT: %F: = fn_decl @F [template] diff --git a/toolchain/check/testdata/if_expr/control_flow.carbon b/toolchain/check/testdata/if_expr/control_flow.carbon index aa1e2d714477..050da38c2bde 100644 --- a/toolchain/check/testdata/if_expr/control_flow.carbon +++ b/toolchain/check/testdata/if_expr/control_flow.carbon @@ -19,7 +19,7 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A, .B = %B, .F = %F} [template] +// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .F = %F} [template] // CHECK:STDOUT: %A: = fn_decl @A [template] // CHECK:STDOUT: %B: = fn_decl @B [template] // CHECK:STDOUT: %F: = fn_decl @F [template] diff --git a/toolchain/check/testdata/if_expr/nested.carbon b/toolchain/check/testdata/if_expr/nested.carbon index bd98bd0b132e..e3a8eec317ee 100644 --- a/toolchain/check/testdata/if_expr/nested.carbon +++ b/toolchain/check/testdata/if_expr/nested.carbon @@ -18,7 +18,7 @@ fn F(a: bool, b: bool, c: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/if_expr/struct.carbon b/toolchain/check/testdata/if_expr/struct.carbon index 0127a22e77de..4047ea1435d6 100644 --- a/toolchain/check/testdata/if_expr/struct.carbon +++ b/toolchain/check/testdata/if_expr/struct.carbon @@ -23,7 +23,7 @@ fn F(cond: bool) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.G = %G, .F = %F} [template] +// CHECK:STDOUT: package: = namespace {.G = %G, .F = %F} [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/array_element_access.carbon b/toolchain/check/testdata/index/array_element_access.carbon index c71fb0723952..02544471ba57 100644 --- a/toolchain/check/testdata/index/array_element_access.carbon +++ b/toolchain/check/testdata/index/array_element_access.carbon @@ -26,7 +26,7 @@ var d: i32 = a[b]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b, .c = %c, .d = %d} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c, .d = %d} [template] // CHECK:STDOUT: %.loc7_14: i32 = int_literal 2 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 2] = var a diff --git a/toolchain/check/testdata/index/expr_category.carbon b/toolchain/check/testdata/index/expr_category.carbon index 60fa4584580c..bf170c163c1b 100644 --- a/toolchain/check/testdata/index/expr_category.carbon +++ b/toolchain/check/testdata/index/expr_category.carbon @@ -43,7 +43,7 @@ fn ValueBinding(b: [i32; 3]) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G, .ValueBinding = %ValueBinding} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .ValueBinding = %ValueBinding} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: %ValueBinding: = fn_decl @ValueBinding [template] diff --git a/toolchain/check/testdata/index/fail_array_large_index.carbon b/toolchain/check/testdata/index/fail_array_large_index.carbon index 5adc8fa8532b..17b41bc7b4f9 100644 --- a/toolchain/check/testdata/index/fail_array_large_index.carbon +++ b/toolchain/check/testdata/index/fail_array_large_index.carbon @@ -24,7 +24,7 @@ var b: i32 = a[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 1] = var a diff --git a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon index 7d36ad8c27a2..26acb08c2f3b 100644 --- a/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon +++ b/toolchain/check/testdata/index/fail_array_non_int_indexing.carbon @@ -24,7 +24,7 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 1] = var a diff --git a/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon b/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon index 9594422a75b5..b3e626bfb1fa 100644 --- a/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon +++ b/toolchain/check/testdata/index/fail_array_out_of_bound_access.carbon @@ -23,7 +23,7 @@ var b: i32 = a[1]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] // CHECK:STDOUT: %.loc7_14: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc7_15: type = array_type %.loc7_14, i32 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref [i32; 1] = var a diff --git a/toolchain/check/testdata/index/fail_empty_tuple_access.carbon b/toolchain/check/testdata/index/fail_empty_tuple_access.carbon index 003edab909a6..82ed03d462a9 100644 --- a/toolchain/check/testdata/index/fail_empty_tuple_access.carbon +++ b/toolchain/check/testdata/index/fail_empty_tuple_access.carbon @@ -21,7 +21,7 @@ fn Run() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .Run = %Run} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %Run: = fn_decl @Run [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_expr_category.carbon b/toolchain/check/testdata/index/fail_expr_category.carbon index 237352bd47ff..c2ffbab486e4 100644 --- a/toolchain/check/testdata/index/fail_expr_category.carbon +++ b/toolchain/check/testdata/index/fail_expr_category.carbon @@ -41,7 +41,7 @@ fn G(b: [i32; 3]) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/index/fail_invalid_base.carbon b/toolchain/check/testdata/index/fail_invalid_base.carbon index b19ef6a3d87a..aac573cb8540 100644 --- a/toolchain/check/testdata/index/fail_invalid_base.carbon +++ b/toolchain/check/testdata/index/fail_invalid_base.carbon @@ -42,8 +42,8 @@ var d: i32 = {.a: i32, .b: i32}[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.N = %.loc11, .a = %a, .F = %F, .b = %b, .c = %c, .d = %d} [template] -// CHECK:STDOUT: %.loc11: = namespace N, {} [template] +// CHECK:STDOUT: package: = namespace {.N = %.loc11, .a = %a, .F = %F, .b = %b, .c = %c, .d = %d} [template] +// CHECK:STDOUT: %.loc11: = namespace {} [template] // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: %N.ref: = name_ref N, %.loc11 [template = %.loc11] diff --git a/toolchain/check/testdata/index/fail_name_not_found.carbon b/toolchain/check/testdata/index/fail_name_not_found.carbon index ebdd493e480d..e2d50565f915 100644 --- a/toolchain/check/testdata/index/fail_name_not_found.carbon +++ b/toolchain/check/testdata/index/fail_name_not_found.carbon @@ -18,7 +18,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_non_deterministic_type.carbon b/toolchain/check/testdata/index/fail_non_deterministic_type.carbon index daceefe6f918..5429fb47c38a 100644 --- a/toolchain/check/testdata/index/fail_non_deterministic_type.carbon +++ b/toolchain/check/testdata/index/fail_non_deterministic_type.carbon @@ -24,7 +24,7 @@ var c: i32 = a[b]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b, .c = %c} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c} [template] // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/fail_non_tuple_access.carbon b/toolchain/check/testdata/index/fail_non_tuple_access.carbon index a6e4b8ff468e..05029e9c164b 100644 --- a/toolchain/check/testdata/index/fail_non_tuple_access.carbon +++ b/toolchain/check/testdata/index/fail_non_tuple_access.carbon @@ -19,7 +19,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/index/fail_out_of_bound_not_literal.carbon b/toolchain/check/testdata/index/fail_out_of_bound_not_literal.carbon index 98e30ab4eb1e..d3fd604b1a1f 100644 --- a/toolchain/check/testdata/index/fail_out_of_bound_not_literal.carbon +++ b/toolchain/check/testdata/index/fail_out_of_bound_not_literal.carbon @@ -25,7 +25,7 @@ var b: i32 = a[{.index = 2}.index]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/fail_tuple_index_error.carbon b/toolchain/check/testdata/index/fail_tuple_index_error.carbon index dc3e66d6b8cb..a66661dd10d1 100644 --- a/toolchain/check/testdata/index/fail_tuple_index_error.carbon +++ b/toolchain/check/testdata/index/fail_tuple_index_error.carbon @@ -22,7 +22,7 @@ var b: i32 = a[oops]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/fail_tuple_large_index.carbon b/toolchain/check/testdata/index/fail_tuple_large_index.carbon index 377ea2a8599e..a9ef5a7a29cd 100644 --- a/toolchain/check/testdata/index/fail_tuple_large_index.carbon +++ b/toolchain/check/testdata/index/fail_tuple_large_index.carbon @@ -22,7 +22,7 @@ var c: i32 = b[0xFFFFFFFFFFFFFFFFF]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b, .c = %c} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c} [template] // CHECK:STDOUT: %.loc7_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32,) = var a diff --git a/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon b/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon index 20773c72bbf2..7951b14c55b3 100644 --- a/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon +++ b/toolchain/check/testdata/index/fail_tuple_non_int_indexing.carbon @@ -23,7 +23,7 @@ var b: i32 = a[2.6]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/fail_tuple_out_of_bound_access.carbon b/toolchain/check/testdata/index/fail_tuple_out_of_bound_access.carbon index 6095ff717a07..074048a9e107 100644 --- a/toolchain/check/testdata/index/fail_tuple_out_of_bound_access.carbon +++ b/toolchain/check/testdata/index/fail_tuple_out_of_bound_access.carbon @@ -23,7 +23,7 @@ var b: i32 = a[2]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/index_not_literal.carbon b/toolchain/check/testdata/index/index_not_literal.carbon index 584c515eb591..89155ed99203 100644 --- a/toolchain/check/testdata/index/index_not_literal.carbon +++ b/toolchain/check/testdata/index/index_not_literal.carbon @@ -22,7 +22,7 @@ var b: i32 = a[{.index = 1}.index]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b} [template] // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32, i32) = var a diff --git a/toolchain/check/testdata/index/tuple_element_access.carbon b/toolchain/check/testdata/index/tuple_element_access.carbon index 4ee31f55cff5..b25f9f85af50 100644 --- a/toolchain/check/testdata/index/tuple_element_access.carbon +++ b/toolchain/check/testdata/index/tuple_element_access.carbon @@ -19,7 +19,7 @@ var c: i32 = b[0]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, .b = %b, .c = %c} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, .b = %b, .c = %c} [template] // CHECK:STDOUT: %.loc7_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %a.var: ref (i32,) = var a diff --git a/toolchain/check/testdata/index/tuple_return_value_access.carbon b/toolchain/check/testdata/index/tuple_return_value_access.carbon index ce722449049a..721dd904b1ed 100644 --- a/toolchain/check/testdata/index/tuple_return_value_access.carbon +++ b/toolchain/check/testdata/index/tuple_return_value_access.carbon @@ -20,7 +20,7 @@ fn Run() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .Run = %Run} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .Run = %Run} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %Run: = fn_decl @Run [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/interface/basic.carbon b/toolchain/check/testdata/interface/basic.carbon index eeda9c7c1afe..b3f551d3feb9 100644 --- a/toolchain/check/testdata/interface/basic.carbon +++ b/toolchain/check/testdata/interface/basic.carbon @@ -16,7 +16,7 @@ interface ForwardDeclared { // CHECK:STDOUT: --- basic.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Empty = %Empty.decl, .ForwardDeclared = %ForwardDeclared.decl.loc10} [template] +// CHECK:STDOUT: package: = namespace {.Empty = %Empty.decl, .ForwardDeclared = %ForwardDeclared.decl.loc10} [template] // CHECK:STDOUT: %Empty.decl = interface_decl @Empty, () // CHECK:STDOUT: %ForwardDeclared.decl.loc10 = interface_decl @ForwardDeclared, () // CHECK:STDOUT: %ForwardDeclared.decl.loc12 = interface_decl @ForwardDeclared, () diff --git a/toolchain/check/testdata/interface/fail_duplicate.carbon b/toolchain/check/testdata/interface/fail_duplicate.carbon index 8b8092b61884..bb182b76e2e4 100644 --- a/toolchain/check/testdata/interface/fail_duplicate.carbon +++ b/toolchain/check/testdata/interface/fail_duplicate.carbon @@ -43,7 +43,7 @@ interface Class { } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Interface = %Interface.decl.loc7, .Function = %Function, .Class = %Class.decl} [template] +// CHECK:STDOUT: package: = namespace {.Interface = %Interface.decl.loc7, .Function = %Function, .Class = %Class.decl} [template] // CHECK:STDOUT: %Interface.decl.loc7 = interface_decl @Interface, () // CHECK:STDOUT: %Interface.decl.loc15 = interface_decl @Interface, () // CHECK:STDOUT: %Function: = fn_decl @Function [template] diff --git a/toolchain/check/testdata/interface/fail_modifiers.carbon b/toolchain/check/testdata/interface/fail_modifiers.carbon index b3867792ae7a..2a33b867a2b8 100644 --- a/toolchain/check/testdata/interface/fail_modifiers.carbon +++ b/toolchain/check/testdata/interface/fail_modifiers.carbon @@ -29,7 +29,7 @@ protected interface Protected; // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Abstract = %Abstract.decl, .Default = %Default.decl, .Virtual = %Virtual.decl, .Protected = %Protected.decl} [template] +// CHECK:STDOUT: package: = namespace {.Abstract = %Abstract.decl, .Default = %Default.decl, .Virtual = %Virtual.decl, .Protected = %Protected.decl} [template] // CHECK:STDOUT: %Abstract.decl = interface_decl @Abstract, () // CHECK:STDOUT: %Default.decl = interface_decl @Default, () // CHECK:STDOUT: %Virtual.decl = interface_decl @Virtual, () diff --git a/toolchain/check/testdata/interface/fail_todo_generic.carbon b/toolchain/check/testdata/interface/fail_todo_generic.carbon index 498643ec02cb..fe4d04804b28 100644 --- a/toolchain/check/testdata/interface/fail_todo_generic.carbon +++ b/toolchain/check/testdata/interface/fail_todo_generic.carbon @@ -15,7 +15,7 @@ interface I[](); // CHECK:STDOUT: --- fail_todo_generic.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.I = %I.decl} [template] +// CHECK:STDOUT: package: = namespace {.I = %I.decl} [template] // CHECK:STDOUT: %I.decl = interface_decl @I, () // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/interface/fail_todo_modifiers.carbon b/toolchain/check/testdata/interface/fail_todo_modifiers.carbon index b2c369132455..3437076bd9e9 100644 --- a/toolchain/check/testdata/interface/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/interface/fail_todo_modifiers.carbon @@ -24,7 +24,7 @@ private interface Private { // CHECK:STDOUT: --- fail_todo_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Modifiers = %Modifiers.decl, .Private = %Private.decl} [template] +// CHECK:STDOUT: package: = namespace {.Modifiers = %Modifiers.decl, .Private = %Private.decl} [template] // CHECK:STDOUT: %Modifiers.decl = interface_decl @Modifiers, () // CHECK:STDOUT: %Private.decl = interface_decl @Private, () // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/ir/duplicate_name_same_line.carbon b/toolchain/check/testdata/ir/duplicate_name_same_line.carbon index fca4be9fbaf8..31ccd3810c08 100644 --- a/toolchain/check/testdata/ir/duplicate_name_same_line.carbon +++ b/toolchain/check/testdata/ir/duplicate_name_same_line.carbon @@ -15,7 +15,7 @@ fn A() { if (true) { var n: i32 = 1; } if (true) { var n: i32 = 2; } } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A} [template] +// CHECK:STDOUT: package: = namespace {.A = %A} [template] // CHECK:STDOUT: %A: = fn_decl @A [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/convert.carbon b/toolchain/check/testdata/let/convert.carbon index 8707516c686f..b42facacb77e 100644 --- a/toolchain/check/testdata/let/convert.carbon +++ b/toolchain/check/testdata/let/convert.carbon @@ -24,7 +24,7 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/fail_duplicate_decl.carbon b/toolchain/check/testdata/let/fail_duplicate_decl.carbon index 36e58ad69cb8..5fdeec40609b 100644 --- a/toolchain/check/testdata/let/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/let/fail_duplicate_decl.carbon @@ -21,7 +21,7 @@ fn F(a: i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/fail_generic.carbon b/toolchain/check/testdata/let/fail_generic.carbon index 03b67a545d5d..20b2b1e9adcb 100644 --- a/toolchain/check/testdata/let/fail_generic.carbon +++ b/toolchain/check/testdata/let/fail_generic.carbon @@ -24,7 +24,7 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/fail_modifiers.carbon b/toolchain/check/testdata/let/fail_modifiers.carbon index 32dcd77ce18c..e1eb884b03b1 100644 --- a/toolchain/check/testdata/let/fail_modifiers.carbon +++ b/toolchain/check/testdata/let/fail_modifiers.carbon @@ -75,7 +75,7 @@ protected protected let i: i32 = 1; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: %.loc10: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %b: i32 = bind_name b, %.loc10 // CHECK:STDOUT: %.loc15: i32 = int_literal 1 [template = constants.%.1] diff --git a/toolchain/check/testdata/let/fail_todo_modifiers.carbon b/toolchain/check/testdata/let/fail_todo_modifiers.carbon index 64c7310bbfc8..3440c8e0f572 100644 --- a/toolchain/check/testdata/let/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/let/fail_todo_modifiers.carbon @@ -16,7 +16,7 @@ private let a: i32 = 1; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: %.loc10: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %a: i32 = bind_name a, %.loc10 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/let/fail_use_in_init.carbon b/toolchain/check/testdata/let/fail_use_in_init.carbon index 64a7bc0f0fea..284c5424292b 100644 --- a/toolchain/check/testdata/let/fail_use_in_init.carbon +++ b/toolchain/check/testdata/let/fail_use_in_init.carbon @@ -14,7 +14,7 @@ fn F() { // CHECK:STDOUT: --- fail_use_in_init.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/generic.carbon b/toolchain/check/testdata/let/generic.carbon index d09b82d46e7a..3330f189acfc 100644 --- a/toolchain/check/testdata/let/generic.carbon +++ b/toolchain/check/testdata/let/generic.carbon @@ -17,7 +17,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/let/global.carbon b/toolchain/check/testdata/let/global.carbon index 2b7bba2b776b..ad838ab60c47 100644 --- a/toolchain/check/testdata/let/global.carbon +++ b/toolchain/check/testdata/let/global.carbon @@ -15,7 +15,7 @@ fn F() -> i32 { return n; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %.loc7: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %n: i32 = bind_name n, %.loc7 // CHECK:STDOUT: %F: = fn_decl @F [template] diff --git a/toolchain/check/testdata/let/local.carbon b/toolchain/check/testdata/let/local.carbon index f2c0f6976c5f..1a7addd86a5e 100644 --- a/toolchain/check/testdata/let/local.carbon +++ b/toolchain/check/testdata/let/local.carbon @@ -12,7 +12,7 @@ fn F(a: i32) -> i32 { // CHECK:STDOUT: --- local.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/add_to_import.carbon b/toolchain/check/testdata/namespace/add_to_import.carbon index a84a51f7e46d..2787f263bcfa 100644 --- a/toolchain/check/testdata/namespace/add_to_import.carbon +++ b/toolchain/check/testdata/namespace/add_to_import.carbon @@ -21,8 +21,8 @@ var a: i32 = NS.A(); // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.NS = %.loc4} [template] -// CHECK:STDOUT: %.loc4: = namespace NS, {} [template] +// CHECK:STDOUT: package: = namespace {.NS = %.loc4} [template] +// CHECK:STDOUT: %.loc4: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit.impl.carbon @@ -32,8 +32,9 @@ var a: i32 = NS.A(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.NS = %.2, .a = %a} [template] -// CHECK:STDOUT: %.2: = namespace NS, {.A = %A} [template] +// CHECK:STDOUT: package: = namespace {.NS = %.2, .a = %a} [template] +// CHECK:STDOUT: %lazy_import_ref = lazy_import_ref ir1, inst+1 +// CHECK:STDOUT: %.2: = namespace {.A = %A}, %lazy_import_ref [template] // CHECK:STDOUT: %A: = fn_decl @A [template] // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var diff --git a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon new file mode 100644 index 000000000000..6a9c48536667 --- /dev/null +++ b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_first.carbon @@ -0,0 +1,49 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// AUTOUPDATE + +// --- namespace.carbon + +package Example library "namespace" api; + +namespace NS; + +// --- conflict.carbon + +package Example api; + +import library "namespace"; + +// CHECK:STDERR: conflict.carbon:[[@LINE+6]]:1: ERROR: Duplicate name being declared in the same scope. +// CHECK:STDERR: fn NS(); +// CHECK:STDERR: ^~~~~~~~ +// CHECK:STDERR: namespace.carbon:4:1: Name is previously declared here. +// CHECK:STDERR: namespace NS; +// CHECK:STDERR: ^~~~~~~~~~~~~ +fn NS(); + +fn NS.Foo(); + +// CHECK:STDOUT: --- namespace.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace {.NS = %.loc4} [template] +// CHECK:STDOUT: %.loc4: = namespace {} [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: --- conflict.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace {.NS = %.2} [template] +// CHECK:STDOUT: %lazy_import_ref = lazy_import_ref ir1, inst+1 +// CHECK:STDOUT: %.2: = namespace {.Foo = %Foo}, %lazy_import_ref [template] +// CHECK:STDOUT: %.loc12: = fn_decl @.1 [template] +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: fn @.1(); +// CHECK:STDOUT: +// CHECK:STDOUT: fn @Foo(); +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon new file mode 100644 index 000000000000..db1c7478bbdd --- /dev/null +++ b/toolchain/check/testdata/namespace/fail_conflict_imported_namespace_second.carbon @@ -0,0 +1,54 @@ +// Part of the Carbon Language project, under the Apache License v2.0 with LLVM +// Exceptions. See /LICENSE for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +// AUTOUPDATE + +// --- fn.carbon + +package Example library "fn" api; + +fn NS(); + +// --- conflict.carbon + +package Example api; + +import library "fn"; + +// CHECK:STDERR: conflict.carbon:[[@LINE+4]]:1: ERROR: Duplicate name being declared in the same scope. +// CHECK:STDERR: namespace NS; +// CHECK:STDERR: ^~~~~~~~~~~~~ +// CHECK:STDERR: conflict.carbon: Name is previously declared here. +namespace NS; + +// CHECK:STDERR: conflict.carbon:[[@LINE+6]]:7: ERROR: Name qualifiers are only allowed for entities that provide a scope. +// CHECK:STDERR: fn NS.Foo(); +// CHECK:STDERR: ^~~ +// CHECK:STDERR: conflict.carbon:[[@LINE+3]]:4: Non-scope entity referenced here. +// CHECK:STDERR: fn NS.Foo(); +// CHECK:STDERR: ^~ +fn NS.Foo(); + +// CHECK:STDOUT: --- fn.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace {.NS = %NS} [template] +// CHECK:STDOUT: %NS: = fn_decl @NS [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: fn @NS(); +// CHECK:STDOUT: +// CHECK:STDOUT: --- conflict.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace {.NS = %.2} [template] +// CHECK:STDOUT: %.2: = fn_decl @.1 [template] +// CHECK:STDOUT: %.loc10: = namespace {} [template] +// CHECK:STDOUT: %.loc18: = fn_decl @.2 [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: fn @.1(); +// CHECK:STDOUT: +// CHECK:STDOUT: fn @.2(); +// CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_conflict_namespace_first.carbon b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon similarity index 64% rename from toolchain/check/testdata/packages/fail_conflict_namespace_first.carbon rename to toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon index e66983416eac..18bebc28f9e1 100644 --- a/toolchain/check/testdata/packages/fail_conflict_namespace_first.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_first.carbon @@ -15,13 +15,15 @@ fn NS.Foo() {} package Example library "fn" api; -// CHECK:STDERR: fn.carbon:[[@LINE+4]]:1: ERROR: Duplicate name being declared in the same scope. +// CHECK:STDERR: fn.carbon:[[@LINE+6]]:1: ERROR: Duplicate name being declared in the same scope. // CHECK:STDERR: fn NS() {} // CHECK:STDERR: ^~~~~~~~~ -// CHECK:STDERR: namespace_then_fn.carbon: Name is previously declared here. +// CHECK:STDERR: namespace.carbon:4:1: Name is previously declared here. +// CHECK:STDERR: namespace NS; +// CHECK:STDERR: ^~~~~~~~~~~~~ fn NS() {} -// --- namespace_then_fn.carbon +// --- conflict.carbon package Example library "namespace_then_fn" api; @@ -33,8 +35,8 @@ fn NS.Bar() {} // CHECK:STDOUT: --- namespace.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.NS = %.loc4} [template] -// CHECK:STDOUT: %.loc4: = namespace NS, {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace {.NS = %.loc4} [template] +// CHECK:STDOUT: %.loc4: = namespace {.Foo = %Foo} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -46,7 +48,7 @@ fn NS.Bar() {} // CHECK:STDOUT: --- fn.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.NS = %NS} [template] +// CHECK:STDOUT: package: = namespace {.NS = %NS} [template] // CHECK:STDOUT: %NS: = fn_decl @NS [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -55,13 +57,14 @@ fn NS.Bar() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- namespace_then_fn.carbon +// CHECK:STDOUT: --- conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.NS = %.2} [template] -// CHECK:STDOUT: %.2: = namespace NS, {.Foo = %lazy_import_ref.1, .Bar = %Bar} [template] -// CHECK:STDOUT: %lazy_import_ref.1 = lazy_import_ref ir1, inst+2 -// CHECK:STDOUT: %lazy_import_ref.2 = lazy_import_ref ir2, inst+1 +// CHECK:STDOUT: package: = namespace {.NS = %.2} [template] +// CHECK:STDOUT: %lazy_import_ref.1 = lazy_import_ref ir1, inst+1 +// CHECK:STDOUT: %.2: = namespace {.Foo = %lazy_import_ref.2, .Bar = %Bar}, %lazy_import_ref.1 [template] +// CHECK:STDOUT: %lazy_import_ref.2 = lazy_import_ref ir1, inst+2 +// CHECK:STDOUT: %lazy_import_ref.3 = lazy_import_ref ir2, inst+1 // CHECK:STDOUT: %Bar: = fn_decl @Bar [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_conflict_namespace_second.carbon b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon similarity index 65% rename from toolchain/check/testdata/packages/fail_conflict_namespace_second.carbon rename to toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon index e8eb164f55f4..8d8d88d8999b 100644 --- a/toolchain/check/testdata/packages/fail_conflict_namespace_second.carbon +++ b/toolchain/check/testdata/namespace/fail_conflict_in_imports_namespace_second.carbon @@ -3,25 +3,27 @@ // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // // AUTOUPDATE -// CHECK:STDERR: fn_then_namespace.carbon: ERROR: Duplicate name being declared in the same scope. - -// --- namespace.carbon - -package Example library "namespace" api; - -namespace NS; -fn NS.Foo() {} // --- fn.carbon package Example library "fn" api; -// CHECK:STDERR: fn.carbon:[[@LINE+3]]:1: Name is previously declared here. -// CHECK:STDERR: fn NS() {} -// CHECK:STDERR: ^~~~~~~~~ fn NS() {} -// --- fn_then_namespace.carbon +// --- namespace.carbon + +package Example library "namespace" api; + +// CHECK:STDERR: namespace.carbon:[[@LINE+6]]:1: ERROR: Duplicate name being declared in the same scope. +// CHECK:STDERR: namespace NS; +// CHECK:STDERR: ^~~~~~~~~~~~~ +// CHECK:STDERR: fn.carbon:4:1: Name is previously declared here. +// CHECK:STDERR: fn NS() {} +// CHECK:STDERR: ^~~~~~~~~ +namespace NS; +fn NS.Foo() {} + +// --- conflict.carbon package Example library "fn_then_namespace" api; @@ -30,23 +32,10 @@ import library "namespace"; fn NS.Bar() {} -// CHECK:STDOUT: --- namespace.carbon -// CHECK:STDOUT: -// CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.NS = %.loc4} [template] -// CHECK:STDOUT: %.loc4: = namespace NS, {.Foo = %Foo} [template] -// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] -// CHECK:STDOUT: } -// CHECK:STDOUT: -// CHECK:STDOUT: fn @Foo() { -// CHECK:STDOUT: !entry: -// CHECK:STDOUT: return -// CHECK:STDOUT: } -// CHECK:STDOUT: // CHECK:STDOUT: --- fn.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.NS = %NS} [template] +// CHECK:STDOUT: package: = namespace {.NS = %NS} [template] // CHECK:STDOUT: %NS: = fn_decl @NS [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -55,13 +44,27 @@ fn NS.Bar() {} // CHECK:STDOUT: return // CHECK:STDOUT: } // CHECK:STDOUT: -// CHECK:STDOUT: --- fn_then_namespace.carbon +// CHECK:STDOUT: --- namespace.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.NS = %.2} [template] +// CHECK:STDOUT: package: = namespace {.NS = %.loc10} [template] +// CHECK:STDOUT: %.loc10: = namespace {.Foo = %Foo} [template] +// CHECK:STDOUT: %Foo: = fn_decl @Foo [template] +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: fn @Foo() { +// CHECK:STDOUT: !entry: +// CHECK:STDOUT: return +// CHECK:STDOUT: } +// CHECK:STDOUT: +// CHECK:STDOUT: --- conflict.carbon +// CHECK:STDOUT: +// CHECK:STDOUT: file { +// CHECK:STDOUT: package: = namespace {.NS = %.2} [template] // CHECK:STDOUT: %lazy_import_ref.1 = lazy_import_ref ir1, inst+1 -// CHECK:STDOUT: %.2: = namespace NS, {.Foo = %lazy_import_ref.2, .Bar = %Bar} [template] -// CHECK:STDOUT: %lazy_import_ref.2 = lazy_import_ref ir2, inst+2 +// CHECK:STDOUT: %lazy_import_ref.2 = lazy_import_ref ir2, inst+1 +// CHECK:STDOUT: %.2: = namespace {.Foo = %lazy_import_ref.3, .Bar = %Bar}, %lazy_import_ref.2 [template] +// CHECK:STDOUT: %lazy_import_ref.3 = lazy_import_ref ir2, inst+2 // CHECK:STDOUT: %Bar: = fn_decl @Bar [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/fail_duplicate.carbon b/toolchain/check/testdata/namespace/fail_duplicate.carbon index 72abf77ca5e7..974e12c023ac 100644 --- a/toolchain/check/testdata/namespace/fail_duplicate.carbon +++ b/toolchain/check/testdata/namespace/fail_duplicate.carbon @@ -21,8 +21,8 @@ fn Foo.Baz() { // CHECK:STDOUT: --- fail_duplicate.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %.loc7} [template] -// CHECK:STDOUT: %.loc7: = namespace Foo, {.Baz = %Baz.loc9} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %.loc7} [template] +// CHECK:STDOUT: %.loc7: = namespace {.Baz = %Baz.loc9} [template] // CHECK:STDOUT: %Baz.loc9: = fn_decl @Baz [template] // CHECK:STDOUT: %Baz.loc18: = fn_decl @Baz [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/fail_import_of_repeat.carbon b/toolchain/check/testdata/namespace/fail_import_of_repeat.carbon index 227379ec1206..f8f709655229 100644 --- a/toolchain/check/testdata/namespace/fail_import_of_repeat.carbon +++ b/toolchain/check/testdata/namespace/fail_import_of_repeat.carbon @@ -24,15 +24,16 @@ package Implicit impl; // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.NS = %.loc4} [template] -// CHECK:STDOUT: %.loc4: = namespace NS, {} [template] -// CHECK:STDOUT: %.loc11: = namespace , {} [template] +// CHECK:STDOUT: package: = namespace {.NS = %.loc4} [template] +// CHECK:STDOUT: %.loc4: = namespace {} [template] +// CHECK:STDOUT: %.loc11: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.NS = %.2} [template] -// CHECK:STDOUT: %.2: = namespace NS, {} [template] +// CHECK:STDOUT: package: = namespace {.NS = %.2} [template] +// CHECK:STDOUT: %lazy_import_ref = lazy_import_ref ir1, inst+1 +// CHECK:STDOUT: %.2: = namespace {}, %lazy_import_ref [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/fail_modifiers.carbon b/toolchain/check/testdata/namespace/fail_modifiers.carbon index 174b7d13481e..a9ddf4b6096a 100644 --- a/toolchain/check/testdata/namespace/fail_modifiers.carbon +++ b/toolchain/check/testdata/namespace/fail_modifiers.carbon @@ -38,8 +38,8 @@ impl namespace Bar; // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %.loc31, .Bar = %.loc36} [template] -// CHECK:STDOUT: %.loc31: = namespace Foo, {} [template] -// CHECK:STDOUT: %.loc36: = namespace Bar, {} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %.loc31, .Bar = %.loc36} [template] +// CHECK:STDOUT: %.loc31: = namespace {} [template] +// CHECK:STDOUT: %.loc36: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon b/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon index c1b3931d0494..62356a398af9 100644 --- a/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon +++ b/toolchain/check/testdata/namespace/fail_unresolved_scope.carbon @@ -13,7 +13,7 @@ fn Foo.Baz() { // CHECK:STDOUT: --- fail_unresolved_scope.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: %.loc10: = fn_decl @.1 [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/function.carbon b/toolchain/check/testdata/namespace/function.carbon index 2643bb460dad..df2f3e36a49f 100644 --- a/toolchain/check/testdata/namespace/function.carbon +++ b/toolchain/check/testdata/namespace/function.carbon @@ -24,8 +24,8 @@ fn Bar() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %.loc7, .Baz = %Baz.loc10, .Bar = %Bar} [template] -// CHECK:STDOUT: %.loc7: = namespace Foo, {.Baz = %Baz.loc13} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %.loc7, .Baz = %Baz.loc10, .Bar = %Bar} [template] +// CHECK:STDOUT: %.loc7: = namespace {.Baz = %Baz.loc13} [template] // CHECK:STDOUT: %Baz.loc10: = fn_decl @Baz.1 [template] // CHECK:STDOUT: %Baz.loc13: = fn_decl @Baz.2 [template] // CHECK:STDOUT: %Bar: = fn_decl @Bar [template] diff --git a/toolchain/check/testdata/namespace/imported.carbon b/toolchain/check/testdata/namespace/imported.carbon index 7073d871f6f8..05f61b509d36 100644 --- a/toolchain/check/testdata/namespace/imported.carbon +++ b/toolchain/check/testdata/namespace/imported.carbon @@ -27,9 +27,9 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.NS = %.loc4} [template] -// CHECK:STDOUT: %.loc4: = namespace NS, {.ChildNS = %.loc5, .A = %A} [template] -// CHECK:STDOUT: %.loc5: = namespace ChildNS, {.B = %B} [template] +// CHECK:STDOUT: package: = namespace {.NS = %.loc4} [template] +// CHECK:STDOUT: %.loc4: = namespace {.ChildNS = %.loc5, .A = %A} [template] +// CHECK:STDOUT: %.loc5: = namespace {.B = %B} [template] // CHECK:STDOUT: %A: = fn_decl @A [template] // CHECK:STDOUT: %B: = fn_decl @B [template] // CHECK:STDOUT: } @@ -45,9 +45,11 @@ var package_b: () = package.NS.ChildNS.B(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.NS = %.2, .a = %a, .b = %b, .package_a = %package_a, .package_b = %package_b} [template] -// CHECK:STDOUT: %.2: = namespace NS, {.ChildNS = %.3, .A = %.4} [template] -// CHECK:STDOUT: %.3: = namespace ChildNS, {.B = %.5} [template] +// CHECK:STDOUT: package: = namespace {.NS = %.2, .a = %a, .b = %b, .package_a = %package_a, .package_b = %package_b} [template] +// CHECK:STDOUT: %lazy_import_ref.1 = lazy_import_ref ir1, inst+1 +// CHECK:STDOUT: %.2: = namespace {.ChildNS = %.3, .A = %.4}, %lazy_import_ref.1 [template] +// CHECK:STDOUT: %lazy_import_ref.2 = lazy_import_ref ir1, inst+2 +// CHECK:STDOUT: %.3: = namespace {.B = %.5}, %lazy_import_ref.2 [template] // CHECK:STDOUT: %.4: = fn_decl @.1 [template] // CHECK:STDOUT: %.5: = fn_decl @.2 [template] // CHECK:STDOUT: %.loc4_9.1: () = tuple_literal () diff --git a/toolchain/check/testdata/namespace/imported_indirect.carbon b/toolchain/check/testdata/namespace/imported_indirect.carbon index c4f60bb80157..9ac6d4eebab8 100644 --- a/toolchain/check/testdata/namespace/imported_indirect.carbon +++ b/toolchain/check/testdata/namespace/imported_indirect.carbon @@ -41,34 +41,40 @@ var e: () = A.B.C.D(); // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %.loc4} [template] -// CHECK:STDOUT: %.loc4: = namespace A, {} [template] +// CHECK:STDOUT: package: = namespace {.A = %.loc4} [template] +// CHECK:STDOUT: %.loc4: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %.2} [template] -// CHECK:STDOUT: %.2: = namespace A, {.B = %.loc5} [template] -// CHECK:STDOUT: %.loc5: = namespace B, {} [template] +// CHECK:STDOUT: package: = namespace {.A = %.2} [template] +// CHECK:STDOUT: %lazy_import_ref = lazy_import_ref ir1, inst+1 +// CHECK:STDOUT: %.2: = namespace {.B = %.loc5}, %lazy_import_ref [template] +// CHECK:STDOUT: %.loc5: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- c.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %.2} [template] -// CHECK:STDOUT: %.2: = namespace A, {.B = %.3} [template] -// CHECK:STDOUT: %.3: = namespace B, {.C = %.loc5} [template] -// CHECK:STDOUT: %.loc5: = namespace C, {} [template] +// CHECK:STDOUT: package: = namespace {.A = %.2} [template] +// CHECK:STDOUT: %lazy_import_ref.1 = lazy_import_ref ir1, inst+2 +// CHECK:STDOUT: %.2: = namespace {.B = %.3}, %lazy_import_ref.1 [template] +// CHECK:STDOUT: %lazy_import_ref.2 = lazy_import_ref ir1, inst+3 +// CHECK:STDOUT: %.3: = namespace {.C = %.loc5}, %lazy_import_ref.2 [template] +// CHECK:STDOUT: %.loc5: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- d.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %.2} [template] -// CHECK:STDOUT: %.2: = namespace A, {.B = %.3} [template] -// CHECK:STDOUT: %.3: = namespace B, {.C = %.4} [template] -// CHECK:STDOUT: %.4: = namespace C, {.D = %D} [template] +// CHECK:STDOUT: package: = namespace {.A = %.2} [template] +// CHECK:STDOUT: %lazy_import_ref.1 = lazy_import_ref ir1, inst+2 +// CHECK:STDOUT: %.2: = namespace {.B = %.3}, %lazy_import_ref.1 [template] +// CHECK:STDOUT: %lazy_import_ref.2 = lazy_import_ref ir1, inst+4 +// CHECK:STDOUT: %.3: = namespace {.C = %.4}, %lazy_import_ref.2 [template] +// CHECK:STDOUT: %lazy_import_ref.3 = lazy_import_ref ir1, inst+5 +// CHECK:STDOUT: %.4: = namespace {.D = %D}, %lazy_import_ref.3 [template] // CHECK:STDOUT: %D: = fn_decl @D [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -84,10 +90,13 @@ var e: () = A.B.C.D(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %.2, .e = %e} [template] -// CHECK:STDOUT: %.2: = namespace A, {.B = %.3} [template] -// CHECK:STDOUT: %.3: = namespace B, {.C = %.4} [template] -// CHECK:STDOUT: %.4: = namespace C, {.D = %.5} [template] +// CHECK:STDOUT: package: = namespace {.A = %.2, .e = %e} [template] +// CHECK:STDOUT: %lazy_import_ref.1 = lazy_import_ref ir1, inst+2 +// CHECK:STDOUT: %.2: = namespace {.B = %.3}, %lazy_import_ref.1 [template] +// CHECK:STDOUT: %lazy_import_ref.2 = lazy_import_ref ir1, inst+4 +// CHECK:STDOUT: %.3: = namespace {.C = %.4}, %lazy_import_ref.2 [template] +// CHECK:STDOUT: %lazy_import_ref.3 = lazy_import_ref ir1, inst+6 +// CHECK:STDOUT: %.4: = namespace {.D = %.5}, %lazy_import_ref.3 [template] // CHECK:STDOUT: %.5: = fn_decl @.1 [template] // CHECK:STDOUT: %.loc5_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc5_9.2: type = converted %.loc5_9.1, constants.%.1 [template = constants.%.1] diff --git a/toolchain/check/testdata/namespace/nested.carbon b/toolchain/check/testdata/namespace/nested.carbon index c3efb32b90fb..870ce44ff539 100644 --- a/toolchain/check/testdata/namespace/nested.carbon +++ b/toolchain/check/testdata/namespace/nested.carbon @@ -21,9 +21,9 @@ fn Foo.Bar.Baz() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %.loc7} [template] -// CHECK:STDOUT: %.loc7: = namespace Foo, {.Bar = %.loc8} [template] -// CHECK:STDOUT: %.loc8: = namespace Bar, {.Wiz = %Wiz, .Baz = %Baz} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %.loc7} [template] +// CHECK:STDOUT: %.loc7: = namespace {.Bar = %.loc8} [template] +// CHECK:STDOUT: %.loc8: = namespace {.Wiz = %Wiz, .Baz = %Baz} [template] // CHECK:STDOUT: %Wiz: = fn_decl @Wiz [template] // CHECK:STDOUT: %Baz: = fn_decl @Baz [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/namespace/shadow.carbon b/toolchain/check/testdata/namespace/shadow.carbon index 0c1be891f25f..e0d2e4bf5d12 100644 --- a/toolchain/check/testdata/namespace/shadow.carbon +++ b/toolchain/check/testdata/namespace/shadow.carbon @@ -32,11 +32,11 @@ fn N.M.B() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A.loc7, .N = %.loc9} [template] +// CHECK:STDOUT: package: = namespace {.A = %A.loc7, .N = %.loc9} [template] // CHECK:STDOUT: %A.loc7: = fn_decl @A.1 [template] -// CHECK:STDOUT: %.loc9: = namespace N, {.A = %A.loc10, .M = %.loc12} [template] +// CHECK:STDOUT: %.loc9: = namespace {.A = %A.loc10, .M = %.loc12} [template] // CHECK:STDOUT: %A.loc10: = fn_decl @A.2 [template] -// CHECK:STDOUT: %.loc12: = namespace M, {.B = %B} [template] +// CHECK:STDOUT: %.loc12: = namespace {.B = %B} [template] // CHECK:STDOUT: %B: = fn_decl @B [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/namespace/unqualified_lookup.carbon b/toolchain/check/testdata/namespace/unqualified_lookup.carbon index 68f43b8cec5a..140a8a2f83c3 100644 --- a/toolchain/check/testdata/namespace/unqualified_lookup.carbon +++ b/toolchain/check/testdata/namespace/unqualified_lookup.carbon @@ -33,9 +33,9 @@ fn OuterN.InnerN.CallABC() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.OuterN = %.loc7, .A = %A, .CallA = %CallA} [template] -// CHECK:STDOUT: %.loc7: = namespace OuterN, {.InnerN = %.loc8, .B = %B, .CallAB = %CallAB} [template] -// CHECK:STDOUT: %.loc8: = namespace InnerN, {.C = %C, .CallABC = %CallABC} [template] +// CHECK:STDOUT: package: = namespace {.OuterN = %.loc7, .A = %A, .CallA = %CallA} [template] +// CHECK:STDOUT: %.loc7: = namespace {.InnerN = %.loc8, .B = %B, .CallAB = %CallAB} [template] +// CHECK:STDOUT: %.loc8: = namespace {.C = %C, .CallABC = %CallABC} [template] // CHECK:STDOUT: %A: = fn_decl @A [template] // CHECK:STDOUT: %B: = fn_decl @B [template] // CHECK:STDOUT: %C: = fn_decl @C [template] diff --git a/toolchain/check/testdata/operators/and.carbon b/toolchain/check/testdata/operators/and.carbon index 6a39a616de5a..4dede8756074 100644 --- a/toolchain/check/testdata/operators/and.carbon +++ b/toolchain/check/testdata/operators/and.carbon @@ -19,7 +19,7 @@ fn And() -> bool { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G, .And = %And} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .And = %And} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: %And: = fn_decl @And [template] diff --git a/toolchain/check/testdata/operators/assignment.carbon b/toolchain/check/testdata/operators/assignment.carbon index 1ba09cb8fae4..90d2d689f44a 100644 --- a/toolchain/check/testdata/operators/assignment.carbon +++ b/toolchain/check/testdata/operators/assignment.carbon @@ -46,7 +46,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/fail_assignment_to_error.carbon b/toolchain/check/testdata/operators/fail_assignment_to_error.carbon index 628a319df9a1..07aa8256d036 100644 --- a/toolchain/check/testdata/operators/fail_assignment_to_error.carbon +++ b/toolchain/check/testdata/operators/fail_assignment_to_error.carbon @@ -22,7 +22,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon b/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon index 37ddf5cd3c37..a7b32ab2bf9a 100644 --- a/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon +++ b/toolchain/check/testdata/operators/fail_assignment_to_non_assignable.carbon @@ -67,7 +67,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .Main = %Main} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/operators/fail_type_mismatch.carbon b/toolchain/check/testdata/operators/fail_type_mismatch.carbon index 233b9d4f6509..904040c9b771 100644 --- a/toolchain/check/testdata/operators/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/operators/fail_type_mismatch.carbon @@ -18,7 +18,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon b/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon index 483fc11f5f49..a47a12e66af6 100644 --- a/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon +++ b/toolchain/check/testdata/operators/fail_type_mismatch_assignment.carbon @@ -20,7 +20,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/operators/or.carbon b/toolchain/check/testdata/operators/or.carbon index c3d550115820..891fc51521d3 100644 --- a/toolchain/check/testdata/operators/or.carbon +++ b/toolchain/check/testdata/operators/or.carbon @@ -18,7 +18,7 @@ fn Or() -> bool { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G, .Or = %Or} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .Or = %Or} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: %Or: = fn_decl @Or [template] diff --git a/toolchain/check/testdata/operators/unary_op.carbon b/toolchain/check/testdata/operators/unary_op.carbon index 713d7f3446d9..2433e0c0edb6 100644 --- a/toolchain/check/testdata/operators/unary_op.carbon +++ b/toolchain/check/testdata/operators/unary_op.carbon @@ -19,7 +19,7 @@ let not_false: bool = not false; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Not = %Not} [template] +// CHECK:STDOUT: package: = namespace {.Not = %Not} [template] // CHECK:STDOUT: %Not: = fn_decl @Not [template] // CHECK:STDOUT: %.loc11_26: bool = bool_literal true [template = constants.%.1] // CHECK:STDOUT: %.loc11_22: bool = not %.loc11_26 [template = constants.%.2] diff --git a/toolchain/check/testdata/package_expr/fail_not_found.carbon b/toolchain/check/testdata/package_expr/fail_not_found.carbon index eed24916c680..da60d53d3f8b 100644 --- a/toolchain/check/testdata/package_expr/fail_not_found.carbon +++ b/toolchain/check/testdata/package_expr/fail_not_found.carbon @@ -14,7 +14,7 @@ fn Main() { // CHECK:STDOUT: --- fail_not_found.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/package_expr/syntax.carbon b/toolchain/check/testdata/package_expr/syntax.carbon index 533d27cde1cf..5b7b0b5c6bc2 100644 --- a/toolchain/check/testdata/package_expr/syntax.carbon +++ b/toolchain/check/testdata/package_expr/syntax.carbon @@ -50,7 +50,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .Main = %Main} [template] // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %.loc4: i32 = int_literal 0 [template = constants.%.1] @@ -81,7 +81,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .Main = %Main} [template] // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %.loc4: i32 = int_literal 0 [template = constants.%.1] @@ -113,8 +113,8 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.NS = %.loc4, .Main = %Main} [template] -// CHECK:STDOUT: %.loc4: = namespace NS, {.C = %C.decl} [template] +// CHECK:STDOUT: package: = namespace {.NS = %.loc4, .Main = %Main} [template] +// CHECK:STDOUT: %.loc4: = namespace {.C = %C.decl} [template] // CHECK:STDOUT: %C.decl = class_decl @C, () // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/explicit_imports.carbon b/toolchain/check/testdata/packages/explicit_imports.carbon index 3ee841b9d9e2..33365cb8a73f 100644 --- a/toolchain/check/testdata/packages/explicit_imports.carbon +++ b/toolchain/check/testdata/packages/explicit_imports.carbon @@ -37,25 +37,25 @@ import library "lib"; // CHECK:STDOUT: --- api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- api_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- same_package.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- different_package.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: %import: = import ir1, ir2 // CHECK:STDOUT: %Api: = bind_name Api, %import // CHECK:STDOUT: } @@ -63,12 +63,12 @@ import library "lib"; // CHECK:STDOUT: --- main_lib_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_import.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_api_not_found.carbon b/toolchain/check/testdata/packages/fail_api_not_found.carbon index 73dbb3c4e4cf..b3a47b90b084 100644 --- a/toolchain/check/testdata/packages/fail_api_not_found.carbon +++ b/toolchain/check/testdata/packages/fail_api_not_found.carbon @@ -28,18 +28,18 @@ library "Bar" impl; // CHECK:STDOUT: --- no_api.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {has_error} [template] +// CHECK:STDOUT: package: = namespace {has_error} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- no_api_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {has_error} [template] +// CHECK:STDOUT: package: = namespace {has_error} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- no_api_main_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {has_error} [template] +// CHECK:STDOUT: package: = namespace {has_error} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon b/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon index 5b4857d57098..ce44c9e496ad 100644 --- a/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon +++ b/toolchain/check/testdata/packages/fail_conflict_no_namespaces.carbon @@ -32,7 +32,7 @@ import library "var"; // CHECK:STDOUT: --- fn.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] // CHECK:STDOUT: %Foo: = fn_decl @Foo [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -41,7 +41,7 @@ import library "var"; // CHECK:STDOUT: --- var.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %Foo} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %Foo} [template] // CHECK:STDOUT: %Foo.var: ref i32 = var Foo // CHECK:STDOUT: %Foo: ref i32 = bind_name Foo, %Foo.var // CHECK:STDOUT: } @@ -49,7 +49,7 @@ import library "var"; // CHECK:STDOUT: --- conflict.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Foo = %lazy_import_ref.1} [template] +// CHECK:STDOUT: package: = namespace {.Foo = %lazy_import_ref.1} [template] // CHECK:STDOUT: %lazy_import_ref.1 = lazy_import_ref ir1, inst+1 // CHECK:STDOUT: %lazy_import_ref.2 = lazy_import_ref ir2, inst+2 // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/fail_cycle.carbon b/toolchain/check/testdata/packages/fail_cycle.carbon index 3800c6b346ac..ce163c86551e 100644 --- a/toolchain/check/testdata/packages/fail_cycle.carbon +++ b/toolchain/check/testdata/packages/fail_cycle.carbon @@ -50,7 +50,7 @@ import B; // CHECK:STDOUT: --- a.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %B: = bind_name B, %import // CHECK:STDOUT: } @@ -58,7 +58,7 @@ import B; // CHECK:STDOUT: --- b.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %C: = bind_name C, %import // CHECK:STDOUT: } @@ -66,7 +66,7 @@ import B; // CHECK:STDOUT: --- c.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %A: = bind_name A, %import // CHECK:STDOUT: } @@ -74,13 +74,13 @@ import B; // CHECK:STDOUT: --- c.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {has_error} [template] +// CHECK:STDOUT: package: = namespace {has_error} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- cycle_child.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %B: = bind_name B, %import // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/fail_duplicate_api.carbon b/toolchain/check/testdata/packages/fail_duplicate_api.carbon index 948e47740414..55f8d8b821c3 100644 --- a/toolchain/check/testdata/packages/fail_duplicate_api.carbon +++ b/toolchain/check/testdata/packages/fail_duplicate_api.carbon @@ -45,48 +45,48 @@ package Package library "lib" api; // CHECK:STDOUT: --- main1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib1.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib2.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_extension.carbon b/toolchain/check/testdata/packages/fail_extension.carbon index 1dc4e7a41c64..1e76279bc0a8 100644 --- a/toolchain/check/testdata/packages/fail_extension.carbon +++ b/toolchain/check/testdata/packages/fail_extension.carbon @@ -73,60 +73,60 @@ package SwappedExt impl; // CHECK:STDOUT: --- main.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_redundant_with_swapped_ext.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib_impl.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_impl.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- package_lib_impl.incorrect // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- swapped_ext.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- swapped_ext.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_import_default.carbon b/toolchain/check/testdata/packages/fail_import_default.carbon index f5e60bcd55bf..4d86f07ae886 100644 --- a/toolchain/check/testdata/packages/fail_import_default.carbon +++ b/toolchain/check/testdata/packages/fail_import_default.carbon @@ -41,24 +41,24 @@ import library default; // CHECK:STDOUT: --- default_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- default.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_import_default.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib_import_default.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_import_invalid.carbon b/toolchain/check/testdata/packages/fail_import_invalid.carbon index 28bd49d0fa56..4fe8a757d133 100644 --- a/toolchain/check/testdata/packages/fail_import_invalid.carbon +++ b/toolchain/check/testdata/packages/fail_import_invalid.carbon @@ -85,55 +85,55 @@ import ImportNotFound; // CHECK:STDOUT: --- main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- not_main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- this.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- this_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit_lib_api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- implicit_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- not_found.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: %import: = import ir1, ir1 // CHECK:STDOUT: %ImportNotFound: = bind_name ImportNotFound, %import // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/packages/fail_import_repeat.carbon b/toolchain/check/testdata/packages/fail_import_repeat.carbon index 36e3ed00ec7d..18edca476ee4 100644 --- a/toolchain/check/testdata/packages/fail_import_repeat.carbon +++ b/toolchain/check/testdata/packages/fail_import_repeat.carbon @@ -61,25 +61,25 @@ import library default; // CHECK:STDOUT: --- api.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- api_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- import.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: %import: = import ir2, ir3 // CHECK:STDOUT: %Api: = bind_name Api, %import // CHECK:STDOUT: } @@ -87,6 +87,6 @@ import library default; // CHECK:STDOUT: --- default_import.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon b/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon index cd2890f4ed52..0903f427c8bc 100644 --- a/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon +++ b/toolchain/check/testdata/packages/fail_name_with_import_failure.carbon @@ -20,7 +20,7 @@ var a: () = A(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a, has_error} [template] +// CHECK:STDOUT: package: = namespace {.a = %a, has_error} [template] // CHECK:STDOUT: %.loc7_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc7_9.2: type = converted %.loc7_9.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %a.var: ref () = var a diff --git a/toolchain/check/testdata/packages/fail_package_main.carbon b/toolchain/check/testdata/packages/fail_package_main.carbon index 1d5eab5d44f3..3fa4b4e55ad7 100644 --- a/toolchain/check/testdata/packages/fail_package_main.carbon +++ b/toolchain/check/testdata/packages/fail_package_main.carbon @@ -36,24 +36,24 @@ package Main library "lib" api; // CHECK:STDOUT: --- main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- raw_main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/fail_todo_lazy_import_ref.carbon b/toolchain/check/testdata/packages/fail_todo_lazy_import_ref.carbon index 0159e771181a..8ff24993d9ce 100644 --- a/toolchain/check/testdata/packages/fail_todo_lazy_import_ref.carbon +++ b/toolchain/check/testdata/packages/fail_todo_lazy_import_ref.carbon @@ -27,7 +27,7 @@ var a: () = a_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a_ref = %a_ref} [template] +// CHECK:STDOUT: package: = namespace {.a_ref = %a_ref} [template] // CHECK:STDOUT: %a_ref.var: ref i32 = var a_ref // CHECK:STDOUT: %a_ref: ref i32 = bind_name a_ref, %a_ref.var // CHECK:STDOUT: %.loc4: i32 = int_literal 0 [template = constants.%.1] @@ -41,7 +41,7 @@ var a: () = a_ref; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a_ref = %package.var, .a = %a} [template] +// CHECK:STDOUT: package: = namespace {.a_ref = %package.var, .a = %a} [template] // CHECK:STDOUT: %package.var: ref = var package // CHECK:STDOUT: %.loc4_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc4_9.2: type = converted %.loc4_9.1, constants.%.1 [template = constants.%.1] diff --git a/toolchain/check/testdata/packages/implicit_imports.carbon b/toolchain/check/testdata/packages/implicit_imports.carbon index d125adfc22b2..8edbf837c2a1 100644 --- a/toolchain/check/testdata/packages/implicit_imports.carbon +++ b/toolchain/check/testdata/packages/implicit_imports.carbon @@ -46,60 +46,60 @@ library "lib" impl; // CHECK:STDOUT: --- api_only.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- api_only_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl_extra.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- with_impl_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: --- main_lib.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/packages/loaded_global.carbon b/toolchain/check/testdata/packages/loaded_global.carbon index 4d77d15581ad..278bda7407d2 100644 --- a/toolchain/check/testdata/packages/loaded_global.carbon +++ b/toolchain/check/testdata/packages/loaded_global.carbon @@ -37,7 +37,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A} [template] +// CHECK:STDOUT: package: = namespace {.A = %A} [template] // CHECK:STDOUT: %A: = fn_decl @A [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -50,7 +50,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %.2, .a = %a, .package_a = %package_a} [template] +// CHECK:STDOUT: package: = namespace {.A = %.2, .a = %a, .package_a = %package_a} [template] // CHECK:STDOUT: %.2: = fn_decl @.1 [template] // CHECK:STDOUT: %.loc4_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc4_9.2: type = converted %.loc4_9.1, constants.%.1 [template = constants.%.1] @@ -74,7 +74,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: --- same_package.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.B = %B} [template] +// CHECK:STDOUT: package: = namespace {.B = %B} [template] // CHECK:STDOUT: %B: = fn_decl @B [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -87,7 +87,7 @@ var package_b: () = package.B(); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.B = %.2, .b = %b, .package_b = %package_b} [template] +// CHECK:STDOUT: package: = namespace {.B = %.2, .b = %b, .package_b = %package_b} [template] // CHECK:STDOUT: %.2: = fn_decl @.1 [template] // CHECK:STDOUT: %.loc6_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc6_9.2: type = converted %.loc6_9.1, constants.%.1 [template = constants.%.1] diff --git a/toolchain/check/testdata/packages/unused_lazy_import.carbon b/toolchain/check/testdata/packages/unused_lazy_import.carbon index c64e68fe14bf..443c4b0cfd4a 100644 --- a/toolchain/check/testdata/packages/unused_lazy_import.carbon +++ b/toolchain/check/testdata/packages/unused_lazy_import.carbon @@ -17,7 +17,7 @@ package Implicit impl; // CHECK:STDOUT: --- implicit.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A} [template] +// CHECK:STDOUT: package: = namespace {.A = %A} [template] // CHECK:STDOUT: %A: = fn_decl @A [template] // CHECK:STDOUT: } // CHECK:STDOUT: @@ -26,7 +26,7 @@ package Implicit impl; // CHECK:STDOUT: --- implicit.impl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %lazy_import_ref} [template] +// CHECK:STDOUT: package: = namespace {.A = %lazy_import_ref} [template] // CHECK:STDOUT: %lazy_import_ref = lazy_import_ref ir1, inst+1 // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/address_of_deref.carbon b/toolchain/check/testdata/pointer/address_of_deref.carbon index 58453d5affa0..574ee89c3f24 100644 --- a/toolchain/check/testdata/pointer/address_of_deref.carbon +++ b/toolchain/check/testdata/pointer/address_of_deref.carbon @@ -17,7 +17,7 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/address_of_lvalue.carbon b/toolchain/check/testdata/pointer/address_of_lvalue.carbon index f92f62e3c1d0..5579fbe1a59d 100644 --- a/toolchain/check/testdata/pointer/address_of_lvalue.carbon +++ b/toolchain/check/testdata/pointer/address_of_lvalue.carbon @@ -33,7 +33,7 @@ fn F() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/basic.carbon b/toolchain/check/testdata/pointer/basic.carbon index 6ee8ed5894f3..bb1ce99c0904 100644 --- a/toolchain/check/testdata/pointer/basic.carbon +++ b/toolchain/check/testdata/pointer/basic.carbon @@ -19,7 +19,7 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_address_of_error.carbon b/toolchain/check/testdata/pointer/fail_address_of_error.carbon index 128d4132bdd4..2ad1df98370c 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_error.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_error.carbon @@ -26,7 +26,7 @@ fn Test() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Test = %Test} [template] +// CHECK:STDOUT: package: = namespace {.Test = %Test} [template] // CHECK:STDOUT: %Test: = fn_decl @Test [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_address_of_value.carbon b/toolchain/check/testdata/pointer/fail_address_of_value.carbon index 21dafa4ece3e..cc3d94734398 100644 --- a/toolchain/check/testdata/pointer/fail_address_of_value.carbon +++ b/toolchain/check/testdata/pointer/fail_address_of_value.carbon @@ -108,7 +108,7 @@ fn AddressOfParam(param: i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.G = %G, .H = %H, .AddressOfLiteral = %AddressOfLiteral, .AddressOfOperator = %AddressOfOperator, .AddressOfCall = %AddressOfCall, .AddressOfType = %AddressOfType, .AddressOfTupleElementValue = %AddressOfTupleElementValue, .AddressOfParam = %AddressOfParam} [template] +// CHECK:STDOUT: package: = namespace {.G = %G, .H = %H, .AddressOfLiteral = %AddressOfLiteral, .AddressOfOperator = %AddressOfOperator, .AddressOfCall = %AddressOfCall, .AddressOfType = %AddressOfType, .AddressOfTupleElementValue = %AddressOfTupleElementValue, .AddressOfParam = %AddressOfParam} [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: %H: = fn_decl @H [template] // CHECK:STDOUT: %AddressOfLiteral: = fn_decl @AddressOfLiteral [template] diff --git a/toolchain/check/testdata/pointer/fail_deref_error.carbon b/toolchain/check/testdata/pointer/fail_deref_error.carbon index 135740ed4665..68c03fa98f3e 100644 --- a/toolchain/check/testdata/pointer/fail_deref_error.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_error.carbon @@ -12,7 +12,7 @@ let n: i32 = *undeclared; // CHECK:STDOUT: --- fail_deref_error.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: %undeclared.ref: = name_ref undeclared, [template = ] // CHECK:STDOUT: %.loc10: ref = deref // CHECK:STDOUT: %n: i32 = bind_name n, diff --git a/toolchain/check/testdata/pointer/fail_deref_function.carbon b/toolchain/check/testdata/pointer/fail_deref_function.carbon index 1df220389fc5..e40745e14ae4 100644 --- a/toolchain/check/testdata/pointer/fail_deref_function.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_function.carbon @@ -14,7 +14,7 @@ fn A() { // CHECK:STDOUT: --- fail_deref_function.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A} [template] +// CHECK:STDOUT: package: = namespace {.A = %A} [template] // CHECK:STDOUT: %A: = fn_decl @A [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_deref_namespace.carbon b/toolchain/check/testdata/pointer/fail_deref_namespace.carbon index f215281924a9..ab7006e3183e 100644 --- a/toolchain/check/testdata/pointer/fail_deref_namespace.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_namespace.carbon @@ -16,8 +16,8 @@ fn F() { // CHECK:STDOUT: --- fail_deref_namespace.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %.loc7, .F = %F} [template] -// CHECK:STDOUT: %.loc7: = namespace A, {} [template] +// CHECK:STDOUT: package: = namespace {.A = %.loc7, .F = %F} [template] +// CHECK:STDOUT: %.loc7: = namespace {} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon index 706a05b954e9..a8ce201f479d 100644 --- a/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_not_pointer.carbon @@ -29,7 +29,7 @@ fn Deref(n: i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Deref = %Deref} [template] +// CHECK:STDOUT: package: = namespace {.Deref = %Deref} [template] // CHECK:STDOUT: %Deref: = fn_decl @Deref [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/fail_deref_type.carbon b/toolchain/check/testdata/pointer/fail_deref_type.carbon index e626744eb2b7..0579e96bf8c3 100644 --- a/toolchain/check/testdata/pointer/fail_deref_type.carbon +++ b/toolchain/check/testdata/pointer/fail_deref_type.carbon @@ -15,7 +15,7 @@ var p: *i32; // CHECK:STDOUT: --- fail_deref_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.p = %p} [template] +// CHECK:STDOUT: package: = namespace {.p = %p} [template] // CHECK:STDOUT: %.loc13: ref = deref i32 // CHECK:STDOUT: %p.var: ref = var p // CHECK:STDOUT: %p: ref = bind_name p, %p.var diff --git a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon index f06645f85b21..282bc42a66bd 100644 --- a/toolchain/check/testdata/pointer/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/pointer/fail_type_mismatch.carbon @@ -22,7 +22,7 @@ fn ConstMismatch(p: const {}*) -> const ({}*) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.ConstMismatch = %ConstMismatch} [template] +// CHECK:STDOUT: package: = namespace {.ConstMismatch = %ConstMismatch} [template] // CHECK:STDOUT: %ConstMismatch: = fn_decl @ConstMismatch [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/nested_const.carbon b/toolchain/check/testdata/pointer/nested_const.carbon index 407a3452ad2c..d5c1deb7fde4 100644 --- a/toolchain/check/testdata/pointer/nested_const.carbon +++ b/toolchain/check/testdata/pointer/nested_const.carbon @@ -20,7 +20,7 @@ fn F(p: const (const (const i32*)*)) -> const i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/pointer/types.carbon b/toolchain/check/testdata/pointer/types.carbon index 7bbbd0e9389a..cc8893355f52 100644 --- a/toolchain/check/testdata/pointer/types.carbon +++ b/toolchain/check/testdata/pointer/types.carbon @@ -21,7 +21,7 @@ fn ConstPtr(p: const i32*) -> (const i32)* { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Ptr = %Ptr, .ConstPtr = %ConstPtr} [template] +// CHECK:STDOUT: package: = namespace {.Ptr = %Ptr, .ConstPtr = %ConstPtr} [template] // CHECK:STDOUT: %Ptr: = fn_decl @Ptr [template] // CHECK:STDOUT: %ConstPtr: = fn_decl @ConstPtr [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/code_after_return.carbon b/toolchain/check/testdata/return/code_after_return.carbon index 5767f3c62df7..4e9255c3566d 100644 --- a/toolchain/check/testdata/return/code_after_return.carbon +++ b/toolchain/check/testdata/return/code_after_return.carbon @@ -16,7 +16,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/code_after_return_value.carbon b/toolchain/check/testdata/return/code_after_return_value.carbon index d9f23ed33923..a8917e9636af 100644 --- a/toolchain/check/testdata/return/code_after_return_value.carbon +++ b/toolchain/check/testdata/return/code_after_return_value.carbon @@ -27,7 +27,7 @@ fn F(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_call_in_type.carbon b/toolchain/check/testdata/return/fail_call_in_type.carbon index b5f5bed77cc7..0aaa155c86ac 100644 --- a/toolchain/check/testdata/return/fail_call_in_type.carbon +++ b/toolchain/check/testdata/return/fail_call_in_type.carbon @@ -19,7 +19,7 @@ fn Six() -> ReturnType() { return 6; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.ReturnType = %ReturnType, .Six = %Six} [template] +// CHECK:STDOUT: package: = namespace {.ReturnType = %ReturnType, .Six = %Six} [template] // CHECK:STDOUT: %ReturnType: = fn_decl @ReturnType [template] // CHECK:STDOUT: %Six: = fn_decl @Six [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_error_in_type.carbon b/toolchain/check/testdata/return/fail_error_in_type.carbon index 299bba4a7840..baa65ec1732d 100644 --- a/toolchain/check/testdata/return/fail_error_in_type.carbon +++ b/toolchain/check/testdata/return/fail_error_in_type.carbon @@ -12,7 +12,7 @@ fn Six() -> x; // CHECK:STDOUT: --- fail_error_in_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Six = %Six} [template] +// CHECK:STDOUT: package: = namespace {.Six = %Six} [template] // CHECK:STDOUT: %Six: = fn_decl @Six [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_missing_return.carbon b/toolchain/check/testdata/return/fail_missing_return.carbon index 54b8f09204ea..c6c37c6518f4 100644 --- a/toolchain/check/testdata/return/fail_missing_return.carbon +++ b/toolchain/check/testdata/return/fail_missing_return.carbon @@ -13,7 +13,7 @@ fn Main() -> i32 { // CHECK:STDOUT: --- fail_missing_return.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon b/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon index 62dae92e60d0..1c5e9d8ca972 100644 --- a/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon +++ b/toolchain/check/testdata/return/fail_missing_return_empty_tuple.carbon @@ -17,7 +17,7 @@ fn F() -> () { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon b/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon index a8396748df9f..51f8a12ff842 100644 --- a/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_var_no_returned_var.carbon @@ -14,7 +14,7 @@ fn Procedure() -> i32 { // CHECK:STDOUT: --- fail_return_var_no_returned_var.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Procedure = %Procedure} [template] +// CHECK:STDOUT: package: = namespace {.Procedure = %Procedure} [template] // CHECK:STDOUT: %Procedure: = fn_decl @Procedure [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon index d7950272c601..bdaa2a3bdf7b 100644 --- a/toolchain/check/testdata/return/fail_return_with_returned_var.carbon +++ b/toolchain/check/testdata/return/fail_return_with_returned_var.carbon @@ -41,7 +41,7 @@ fn G() -> C { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .C = %C.decl, .G = %G} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .C = %C.decl, .G = %G} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %C.decl = class_decl @C, () // CHECK:STDOUT: %G: = fn_decl @G [template] diff --git a/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon b/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon index 6e24d83129d5..c5f95071d6b8 100644 --- a/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_no_return_type.carbon @@ -22,7 +22,7 @@ fn Procedure() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Procedure = %Procedure} [template] +// CHECK:STDOUT: package: = namespace {.Procedure = %Procedure} [template] // CHECK:STDOUT: %Procedure: = fn_decl @Procedure [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon index edd459357aa5..3b8012cddeae 100644 --- a/toolchain/check/testdata/return/fail_returned_var_shadow.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_shadow.carbon @@ -43,7 +43,7 @@ fn DifferentScopes() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.SameScope = %SameScope, .DifferentScopes = %DifferentScopes} [template] +// CHECK:STDOUT: package: = namespace {.SameScope = %SameScope, .DifferentScopes = %DifferentScopes} [template] // CHECK:STDOUT: %SameScope: = fn_decl @SameScope [template] // CHECK:STDOUT: %DifferentScopes: = fn_decl @DifferentScopes [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/fail_returned_var_type.carbon b/toolchain/check/testdata/return/fail_returned_var_type.carbon index 0a43a826b5b1..3d2a6c3cfde4 100644 --- a/toolchain/check/testdata/return/fail_returned_var_type.carbon +++ b/toolchain/check/testdata/return/fail_returned_var_type.carbon @@ -22,7 +22,7 @@ fn Mismatch() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Mismatch = %Mismatch} [template] +// CHECK:STDOUT: package: = namespace {.Mismatch = %Mismatch} [template] // CHECK:STDOUT: %Mismatch: = fn_decl @Mismatch [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_type_mismatch.carbon b/toolchain/check/testdata/return/fail_type_mismatch.carbon index bb94fc99940c..cd85edfd5764 100644 --- a/toolchain/check/testdata/return/fail_type_mismatch.carbon +++ b/toolchain/check/testdata/return/fail_type_mismatch.carbon @@ -18,7 +18,7 @@ fn Main() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_value_disallowed.carbon b/toolchain/check/testdata/return/fail_value_disallowed.carbon index b251850a8148..819c91b668d7 100644 --- a/toolchain/check/testdata/return/fail_value_disallowed.carbon +++ b/toolchain/check/testdata/return/fail_value_disallowed.carbon @@ -21,7 +21,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_value_missing.carbon b/toolchain/check/testdata/return/fail_value_missing.carbon index cd9fb59706c4..741a9696348b 100644 --- a/toolchain/check/testdata/return/fail_value_missing.carbon +++ b/toolchain/check/testdata/return/fail_value_missing.carbon @@ -17,7 +17,7 @@ fn Main() -> i32 { // CHECK:STDOUT: --- fail_value_missing.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/fail_var_in_type.carbon b/toolchain/check/testdata/return/fail_var_in_type.carbon index af22cd8539c8..578557e8131b 100644 --- a/toolchain/check/testdata/return/fail_var_in_type.carbon +++ b/toolchain/check/testdata/return/fail_var_in_type.carbon @@ -17,7 +17,7 @@ fn Six() -> x { return 6; } // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .Six = %Six} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .Six = %Six} [template] // CHECK:STDOUT: %x.var: ref type = var x // CHECK:STDOUT: %x: ref type = bind_name x, %x.var // CHECK:STDOUT: assign %x.var, i32 diff --git a/toolchain/check/testdata/return/missing_return_no_return_type.carbon b/toolchain/check/testdata/return/missing_return_no_return_type.carbon index f160acb7dbaf..c9b88193bc22 100644 --- a/toolchain/check/testdata/return/missing_return_no_return_type.carbon +++ b/toolchain/check/testdata/return/missing_return_no_return_type.carbon @@ -10,7 +10,7 @@ fn F() { // CHECK:STDOUT: --- missing_return_no_return_type.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/no_value.carbon b/toolchain/check/testdata/return/no_value.carbon index f39bd7ed0bb1..2b7e5e6746e5 100644 --- a/toolchain/check/testdata/return/no_value.carbon +++ b/toolchain/check/testdata/return/no_value.carbon @@ -11,7 +11,7 @@ fn Main() { // CHECK:STDOUT: --- no_value.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/returned_var.carbon b/toolchain/check/testdata/return/returned_var.carbon index b4b1814f01ed..c6c5855c372e 100644 --- a/toolchain/check/testdata/return/returned_var.carbon +++ b/toolchain/check/testdata/return/returned_var.carbon @@ -33,7 +33,7 @@ fn G() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.C = %C.decl, .F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace {.C = %C.decl, .F = %F, .G = %G} [template] // CHECK:STDOUT: %C.decl = class_decl @C, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] diff --git a/toolchain/check/testdata/return/returned_var_scope.carbon b/toolchain/check/testdata/return/returned_var_scope.carbon index 5dfde9e50e15..844bcc1d0daa 100644 --- a/toolchain/check/testdata/return/returned_var_scope.carbon +++ b/toolchain/check/testdata/return/returned_var_scope.carbon @@ -32,7 +32,7 @@ fn EnclosingButAfter(b: bool) -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.UnrelatedScopes = %UnrelatedScopes, .EnclosingButAfter = %EnclosingButAfter} [template] +// CHECK:STDOUT: package: = namespace {.UnrelatedScopes = %UnrelatedScopes, .EnclosingButAfter = %EnclosingButAfter} [template] // CHECK:STDOUT: %UnrelatedScopes: = fn_decl @UnrelatedScopes [template] // CHECK:STDOUT: %EnclosingButAfter: = fn_decl @EnclosingButAfter [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/return/struct.carbon b/toolchain/check/testdata/return/struct.carbon index cafe6c26fa32..1ecc4d7e9801 100644 --- a/toolchain/check/testdata/return/struct.carbon +++ b/toolchain/check/testdata/return/struct.carbon @@ -17,7 +17,7 @@ fn Main() -> {.a: i32} { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/tuple.carbon b/toolchain/check/testdata/return/tuple.carbon index e147ccef0938..42c199c162f4 100644 --- a/toolchain/check/testdata/return/tuple.carbon +++ b/toolchain/check/testdata/return/tuple.carbon @@ -21,7 +21,7 @@ fn Main() -> (i32, i32) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/return/value.carbon b/toolchain/check/testdata/return/value.carbon index db0cd080567a..19155062d46a 100644 --- a/toolchain/check/testdata/return/value.carbon +++ b/toolchain/check/testdata/return/value.carbon @@ -15,7 +15,7 @@ fn Main() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/empty.carbon b/toolchain/check/testdata/struct/empty.carbon index 72fff189b44c..e23271080960 100644 --- a/toolchain/check/testdata/struct/empty.carbon +++ b/toolchain/check/testdata/struct/empty.carbon @@ -16,7 +16,7 @@ var y: {} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] // CHECK:STDOUT: %.loc7_9.1: {} = struct_literal () // CHECK:STDOUT: %.loc7_9.2: type = converted %.loc7_9.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {} = var x diff --git a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon index 7b2ecee2df61..262341d15ec9 100644 --- a/toolchain/check/testdata/struct/fail_access_into_invalid.carbon +++ b/toolchain/check/testdata/struct/fail_access_into_invalid.carbon @@ -13,7 +13,7 @@ fn F() { a.b; } // CHECK:STDOUT: --- fail_access_into_invalid.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F} [template] +// CHECK:STDOUT: package: = namespace {.F = %F} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_assign_empty.carbon b/toolchain/check/testdata/struct/fail_assign_empty.carbon index 2d1f657e919b..64c6dc2a84e7 100644 --- a/toolchain/check/testdata/struct/fail_assign_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_empty.carbon @@ -17,7 +17,7 @@ var x: {.a: i32} = {}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_assign_nested.carbon b/toolchain/check/testdata/struct/fail_assign_nested.carbon index bf9d8d9f84ae..a277e8da4456 100644 --- a/toolchain/check/testdata/struct/fail_assign_nested.carbon +++ b/toolchain/check/testdata/struct/fail_assign_nested.carbon @@ -20,7 +20,7 @@ var x: {.a: {}} = {.b = {}}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc10_14.1: {} = struct_literal () // CHECK:STDOUT: %.loc10_14.2: type = converted %.loc10_14.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %.loc10_15: type = struct_type {.a: {}} [template = constants.%.2] diff --git a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon index 2f4d179d4347..e85f4d2b1c93 100644 --- a/toolchain/check/testdata/struct/fail_assign_to_empty.carbon +++ b/toolchain/check/testdata/struct/fail_assign_to_empty.carbon @@ -19,7 +19,7 @@ var x: {} = {.a = 1}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc10_9.1: {} = struct_literal () // CHECK:STDOUT: %.loc10_9.2: type = converted %.loc10_9.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {} = var x diff --git a/toolchain/check/testdata/struct/fail_duplicate_name.carbon b/toolchain/check/testdata/struct/fail_duplicate_name.carbon index d5bb5c6f0e33..3108e778fafb 100644 --- a/toolchain/check/testdata/struct/fail_duplicate_name.carbon +++ b/toolchain/check/testdata/struct/fail_duplicate_name.carbon @@ -57,7 +57,7 @@ var y: {.b: i32, .c: i32} = {.b = 3, .b = 4}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .x = %x, .y = %y} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %.loc21_35: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc21_36: {.a: i32} = struct_literal (%.loc21_35) diff --git a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon index 7ea7979425e6..de8445f7a96b 100644 --- a/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_name_mismatch.carbon @@ -23,7 +23,7 @@ var y: {.b: i32} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon index 2699614f7eee..f5abdf747fb8 100644 --- a/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon +++ b/toolchain/check/testdata/struct/fail_field_type_mismatch.carbon @@ -18,7 +18,7 @@ var x: {.a: i32} = {.b = 1.0}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_member_access_type.carbon b/toolchain/check/testdata/struct/fail_member_access_type.carbon index 90f3de0d829e..7aab63a1cc01 100644 --- a/toolchain/check/testdata/struct/fail_member_access_type.carbon +++ b/toolchain/check/testdata/struct/fail_member_access_type.carbon @@ -19,7 +19,7 @@ var y: i32 = x.b; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] // CHECK:STDOUT: %.loc7_16: type = struct_type {.a: f64} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: f64} = var x // CHECK:STDOUT: %x: ref {.a: f64} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_member_of_function.carbon b/toolchain/check/testdata/struct/fail_member_of_function.carbon index 905662f97afe..a26067a980b3 100644 --- a/toolchain/check/testdata/struct/fail_member_of_function.carbon +++ b/toolchain/check/testdata/struct/fail_member_of_function.carbon @@ -14,7 +14,7 @@ fn A() { // CHECK:STDOUT: --- fail_member_of_function.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A} [template] +// CHECK:STDOUT: package: = namespace {.A = %A} [template] // CHECK:STDOUT: %A: = fn_decl @A [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon index 4544e8a86e63..92cb04515c1c 100644 --- a/toolchain/check/testdata/struct/fail_nested_incomplete.carbon +++ b/toolchain/check/testdata/struct/fail_nested_incomplete.carbon @@ -29,7 +29,7 @@ var p: Incomplete* = &s.a; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Incomplete = %Incomplete.decl, .s = %s, .p = %p} [template] +// CHECK:STDOUT: package: = namespace {.Incomplete = %Incomplete.decl, .s = %s, .p = %p} [template] // CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete, () // CHECK:STDOUT: %Incomplete.ref.loc15: type = name_ref Incomplete, constants.%Incomplete [template = constants.%Incomplete] // CHECK:STDOUT: %.loc15: type = struct_type {.a: Incomplete} [template = constants.%.1] diff --git a/toolchain/check/testdata/struct/fail_non_member_access.carbon b/toolchain/check/testdata/struct/fail_non_member_access.carbon index b755490ff37e..903845c527a9 100644 --- a/toolchain/check/testdata/struct/fail_non_member_access.carbon +++ b/toolchain/check/testdata/struct/fail_non_member_access.carbon @@ -19,7 +19,7 @@ var y: i32 = x.b; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] // CHECK:STDOUT: %.loc7_16: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_too_few_values.carbon b/toolchain/check/testdata/struct/fail_too_few_values.carbon index 9efa288daa46..1382abc21e99 100644 --- a/toolchain/check/testdata/struct/fail_too_few_values.carbon +++ b/toolchain/check/testdata/struct/fail_too_few_values.carbon @@ -19,7 +19,7 @@ var x: {.a: i32, .b: i32} = {.a = 1}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc10_25: type = struct_type {.a: i32, .b: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: i32, .b: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32, .b: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_type_assign.carbon b/toolchain/check/testdata/struct/fail_type_assign.carbon index 2e953dce3636..3d4bee429f8b 100644 --- a/toolchain/check/testdata/struct/fail_type_assign.carbon +++ b/toolchain/check/testdata/struct/fail_type_assign.carbon @@ -16,7 +16,7 @@ var x: {.a: i32} = {.a: i32}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc10_16: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/fail_value_as_type.carbon b/toolchain/check/testdata/struct/fail_value_as_type.carbon index b615620f6806..1d3cc52b6aad 100644 --- a/toolchain/check/testdata/struct/fail_value_as_type.carbon +++ b/toolchain/check/testdata/struct/fail_value_as_type.carbon @@ -17,7 +17,7 @@ var x: {.a = 1}; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc10_14: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc10_15: {.a: i32} = struct_literal (%.loc10_14) // CHECK:STDOUT: %x.var: ref = var x diff --git a/toolchain/check/testdata/struct/literal_member_access.carbon b/toolchain/check/testdata/struct/literal_member_access.carbon index aeb9abfa45fc..c1ae525e7947 100644 --- a/toolchain/check/testdata/struct/literal_member_access.carbon +++ b/toolchain/check/testdata/struct/literal_member_access.carbon @@ -23,7 +23,7 @@ fn F() -> i32 { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.G = %G, .F = %F} [template] +// CHECK:STDOUT: package: = namespace {.G = %G, .F = %F} [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/member_access.carbon b/toolchain/check/testdata/struct/member_access.carbon index e033535e79c0..0c8a5bee9c80 100644 --- a/toolchain/check/testdata/struct/member_access.carbon +++ b/toolchain/check/testdata/struct/member_access.carbon @@ -19,7 +19,7 @@ var z: i32 = y; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y, .z = %z} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y, .z = %z} [template] // CHECK:STDOUT: %.loc7_25: type = struct_type {.a: f64, .b: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: f64, .b: i32} = var x // CHECK:STDOUT: %x: ref {.a: f64, .b: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/nested_struct_in_place.carbon b/toolchain/check/testdata/struct/nested_struct_in_place.carbon index 2598a42f8b45..88ec7ca56819 100644 --- a/toolchain/check/testdata/struct/nested_struct_in_place.carbon +++ b/toolchain/check/testdata/struct/nested_struct_in_place.carbon @@ -22,7 +22,7 @@ fn G() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/struct/one_entry.carbon b/toolchain/check/testdata/struct/one_entry.carbon index 9fd5f4830b3e..3f3c458f23f7 100644 --- a/toolchain/check/testdata/struct/one_entry.carbon +++ b/toolchain/check/testdata/struct/one_entry.carbon @@ -16,7 +16,7 @@ var y: {.a: i32} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] // CHECK:STDOUT: %.loc7_16: type = struct_type {.a: i32} [template = constants.%.1] // CHECK:STDOUT: %x.var: ref {.a: i32} = var x // CHECK:STDOUT: %x: ref {.a: i32} = bind_name x, %x.var diff --git a/toolchain/check/testdata/struct/reorder_fields.carbon b/toolchain/check/testdata/struct/reorder_fields.carbon index d23b918684c1..cdc8057e5eb1 100644 --- a/toolchain/check/testdata/struct/reorder_fields.carbon +++ b/toolchain/check/testdata/struct/reorder_fields.carbon @@ -23,7 +23,7 @@ fn F() -> {.a: i32, .b: f64} { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.MakeI32 = %MakeI32, .MakeF64 = %MakeF64, .F = %F} [template] +// CHECK:STDOUT: package: = namespace {.MakeI32 = %MakeI32, .MakeF64 = %MakeF64, .F = %F} [template] // CHECK:STDOUT: %MakeI32: = fn_decl @MakeI32 [template] // CHECK:STDOUT: %MakeF64: = fn_decl @MakeF64 [template] // CHECK:STDOUT: %F: = fn_decl @F [template] diff --git a/toolchain/check/testdata/struct/tuple_as_element.carbon b/toolchain/check/testdata/struct/tuple_as_element.carbon index 38a8302a13b8..0d73f17b3d9d 100644 --- a/toolchain/check/testdata/struct/tuple_as_element.carbon +++ b/toolchain/check/testdata/struct/tuple_as_element.carbon @@ -21,7 +21,7 @@ var y: {.a: i32, .b: (i32,)} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] // CHECK:STDOUT: %.loc7_27.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_27.2: type = converted %.loc7_27.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %.loc7_28: type = struct_type {.a: i32, .b: (i32,)} [template = constants.%.3] diff --git a/toolchain/check/testdata/struct/two_entries.carbon b/toolchain/check/testdata/struct/two_entries.carbon index 706c0fb64fc9..e464383c99dc 100644 --- a/toolchain/check/testdata/struct/two_entries.carbon +++ b/toolchain/check/testdata/struct/two_entries.carbon @@ -21,7 +21,7 @@ var y: {.a: i32, .b: i32} = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] // CHECK:STDOUT: %.loc7_25: type = struct_type {.a: i32, .b: i32} [template = constants.%.1] // CHECK:STDOUT: %.loc7_35: i32 = int_literal 1 [template = constants.%.3] // CHECK:STDOUT: %.loc7_43: i32 = int_literal 2 [template = constants.%.4] diff --git a/toolchain/check/testdata/tuples/empty.carbon b/toolchain/check/testdata/tuples/empty.carbon index 8709c68db1dc..fd38d85e0579 100644 --- a/toolchain/check/testdata/tuples/empty.carbon +++ b/toolchain/check/testdata/tuples/empty.carbon @@ -15,7 +15,7 @@ var y: () = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] // CHECK:STDOUT: %.loc7_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc7_9.2: type = converted %.loc7_9.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %x.var: ref () = var x diff --git a/toolchain/check/testdata/tuples/fail_assign_empty.carbon b/toolchain/check/testdata/tuples/fail_assign_empty.carbon index fdd5e6a1f50a..19e0d6008b9e 100644 --- a/toolchain/check/testdata/tuples/fail_assign_empty.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_empty.carbon @@ -18,7 +18,7 @@ var x: (i32,) = (); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc10_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc10_13.2: type = converted %.loc10_13.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %x.var: ref (i32,) = var x diff --git a/toolchain/check/testdata/tuples/fail_assign_nested.carbon b/toolchain/check/testdata/tuples/fail_assign_nested.carbon index e88df09763cb..0901b6a035f5 100644 --- a/toolchain/check/testdata/tuples/fail_assign_nested.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_nested.carbon @@ -30,7 +30,7 @@ var x: ((i32, i32), (i32, i32)) = ((1, 2, 3), (4, 5, 6)); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc10_18.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_30.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_31.1: ((type, type), (type, type)) = tuple_literal (%.loc10_18.1, %.loc10_30.1) diff --git a/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon b/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon index 2418568ee0fa..31f2753a8bca 100644 --- a/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon +++ b/toolchain/check/testdata/tuples/fail_assign_to_empty.carbon @@ -17,7 +17,7 @@ var x: () = (66); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc10_9.1: () = tuple_literal () // CHECK:STDOUT: %.loc10_9.2: type = converted %.loc10_9.1, constants.%.1 [template = constants.%.1] // CHECK:STDOUT: %x.var: ref () = var x diff --git a/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon b/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon index e57d05c1607a..5671132508f7 100644 --- a/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon +++ b/toolchain/check/testdata/tuples/fail_element_type_mismatch.carbon @@ -21,7 +21,7 @@ var x: (i32, i32) = (2, 65.89); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc10_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_17.2: type = converted %.loc10_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %x.var: ref (i32, i32) = var x diff --git a/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon b/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon index 1d345d465104..1071f131e661 100644 --- a/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon +++ b/toolchain/check/testdata/tuples/fail_nested_incomplete.carbon @@ -31,7 +31,7 @@ var p: Incomplete* = &t[1]; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Incomplete = %Incomplete.decl, .t = %t, .p = %p} [template] +// CHECK:STDOUT: package: = namespace {.Incomplete = %Incomplete.decl, .t = %t, .p = %p} [template] // CHECK:STDOUT: %Incomplete.decl = class_decl @Incomplete, () // CHECK:STDOUT: %Incomplete.ref.loc15: type = name_ref Incomplete, constants.%Incomplete [template = constants.%Incomplete] // CHECK:STDOUT: %.loc15_24.1: (type, type) = tuple_literal (i32, %Incomplete.ref.loc15) diff --git a/toolchain/check/testdata/tuples/fail_too_few_element.carbon b/toolchain/check/testdata/tuples/fail_too_few_element.carbon index f92adf591dd0..90e790ccbf10 100644 --- a/toolchain/check/testdata/tuples/fail_too_few_element.carbon +++ b/toolchain/check/testdata/tuples/fail_too_few_element.carbon @@ -20,7 +20,7 @@ var x: (i32, i32) = (2, ); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc10_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc10_17.2: type = converted %.loc10_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %x.var: ref (i32, i32) = var x diff --git a/toolchain/check/testdata/tuples/fail_type_assign.carbon b/toolchain/check/testdata/tuples/fail_type_assign.carbon index c8c09c1d8abd..a2f06ed18480 100644 --- a/toolchain/check/testdata/tuples/fail_type_assign.carbon +++ b/toolchain/check/testdata/tuples/fail_type_assign.carbon @@ -17,7 +17,7 @@ var x: (i32, ) = (i32, ); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc10_14.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc10_14.2: type = converted %.loc10_14.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %x.var: ref (i32,) = var x diff --git a/toolchain/check/testdata/tuples/fail_value_as_type.carbon b/toolchain/check/testdata/tuples/fail_value_as_type.carbon index 1c2fc3a90077..13ad6a241d5e 100644 --- a/toolchain/check/testdata/tuples/fail_value_as_type.carbon +++ b/toolchain/check/testdata/tuples/fail_value_as_type.carbon @@ -18,7 +18,7 @@ var x: (1, ); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc10_9: i32 = int_literal 1 [template = constants.%.1] // CHECK:STDOUT: %.loc10_12.1: (i32,) = tuple_literal (%.loc10_9) // CHECK:STDOUT: %.loc10_12.2: type = converted %.loc10_12.1, constants.%.3 [template = constants.%.3] diff --git a/toolchain/check/testdata/tuples/nested_tuple.carbon b/toolchain/check/testdata/tuples/nested_tuple.carbon index b0afcd4327b7..b2adb5fd413b 100644 --- a/toolchain/check/testdata/tuples/nested_tuple.carbon +++ b/toolchain/check/testdata/tuples/nested_tuple.carbon @@ -24,7 +24,7 @@ var x: ((i32, i32), i32) = ((12, 76), 6); // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %.loc7_18.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_24.1: ((type, type), type) = tuple_literal (%.loc7_18.1, i32) // CHECK:STDOUT: %.loc7_18.2: type = converted %.loc7_18.1, constants.%.3 [template = constants.%.3] diff --git a/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon b/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon index 4b1935bb93f5..bf63724b711d 100644 --- a/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon +++ b/toolchain/check/testdata/tuples/nested_tuple_in_place.carbon @@ -33,7 +33,7 @@ fn H() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.F = %F, .G = %G, .H = %H} [template] +// CHECK:STDOUT: package: = namespace {.F = %F, .G = %G, .H = %H} [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] // CHECK:STDOUT: %H: = fn_decl @H [template] diff --git a/toolchain/check/testdata/tuples/one_element.carbon b/toolchain/check/testdata/tuples/one_element.carbon index 4333a80b98ea..64ae2f7be2c6 100644 --- a/toolchain/check/testdata/tuples/one_element.carbon +++ b/toolchain/check/testdata/tuples/one_element.carbon @@ -17,7 +17,7 @@ var y: (i32,) = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] // CHECK:STDOUT: %.loc7_13.1: (type,) = tuple_literal (i32) // CHECK:STDOUT: %.loc7_13.2: type = converted %.loc7_13.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %x.var: ref (i32,) = var x diff --git a/toolchain/check/testdata/tuples/two_elements.carbon b/toolchain/check/testdata/tuples/two_elements.carbon index e9306ba8b566..c54aba0ef70e 100644 --- a/toolchain/check/testdata/tuples/two_elements.carbon +++ b/toolchain/check/testdata/tuples/two_elements.carbon @@ -22,7 +22,7 @@ var y: (i32, i32) = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] // CHECK:STDOUT: %.loc7_17.1: (type, type) = tuple_literal (i32, i32) // CHECK:STDOUT: %.loc7_17.2: type = converted %.loc7_17.1, constants.%.2 [template = constants.%.2] // CHECK:STDOUT: %.loc7_22: i32 = int_literal 4 [template = constants.%.4] diff --git a/toolchain/check/testdata/var/decl.carbon b/toolchain/check/testdata/var/decl.carbon index b908dbb8af09..27ba0c24dc02 100644 --- a/toolchain/check/testdata/var/decl.carbon +++ b/toolchain/check/testdata/var/decl.carbon @@ -11,7 +11,7 @@ fn Main() { // CHECK:STDOUT: --- decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/decl_with_init.carbon b/toolchain/check/testdata/var/decl_with_init.carbon index cd17d0e061e4..85a897b94064 100644 --- a/toolchain/check/testdata/var/decl_with_init.carbon +++ b/toolchain/check/testdata/var/decl_with_init.carbon @@ -15,7 +15,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_duplicate_decl.carbon b/toolchain/check/testdata/var/fail_duplicate_decl.carbon index 855247aced9f..6e5916fc9c95 100644 --- a/toolchain/check/testdata/var/fail_duplicate_decl.carbon +++ b/toolchain/check/testdata/var/fail_duplicate_decl.carbon @@ -23,7 +23,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_generic.carbon b/toolchain/check/testdata/var/fail_generic.carbon index e90997d44571..48d17363959c 100644 --- a/toolchain/check/testdata/var/fail_generic.carbon +++ b/toolchain/check/testdata/var/fail_generic.carbon @@ -18,7 +18,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon index 859976654aca..94ebfccaa0f4 100644 --- a/toolchain/check/testdata/var/fail_init_type_mismatch.carbon +++ b/toolchain/check/testdata/var/fail_init_type_mismatch.carbon @@ -18,7 +18,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_init_with_self.carbon b/toolchain/check/testdata/var/fail_init_with_self.carbon index d7d29dfecd7c..8fc7970bee8b 100644 --- a/toolchain/check/testdata/var/fail_init_with_self.carbon +++ b/toolchain/check/testdata/var/fail_init_with_self.carbon @@ -14,7 +14,7 @@ fn Main() { // CHECK:STDOUT: --- fail_init_with_self.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon b/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon index 1863cbef8f27..ac657e48f898 100644 --- a/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon +++ b/toolchain/check/testdata/var/fail_lookup_outside_scope.carbon @@ -16,7 +16,7 @@ var y: i32 = x; // CHECK:STDOUT: --- fail_lookup_outside_scope.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main, .y = %y} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main, .y = %y} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: %y.var: ref i32 = var y // CHECK:STDOUT: %y: ref i32 = bind_name y, %y.var diff --git a/toolchain/check/testdata/var/fail_modifiers.carbon b/toolchain/check/testdata/var/fail_modifiers.carbon index e4581862846a..01ed2034bc26 100644 --- a/toolchain/check/testdata/var/fail_modifiers.carbon +++ b/toolchain/check/testdata/var/fail_modifiers.carbon @@ -39,7 +39,7 @@ abstract var e: i32; // CHECK:STDOUT: --- fail_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.b = %b, .c = %c, .d = %d, .e = %e} [template] +// CHECK:STDOUT: package: = namespace {.b = %b, .c = %c, .d = %d, .e = %e} [template] // CHECK:STDOUT: %b.var: ref i32 = var b // CHECK:STDOUT: %b: ref i32 = bind_name b, %b.var // CHECK:STDOUT: %c.var: ref i32 = var c diff --git a/toolchain/check/testdata/var/fail_not_copyable.carbon b/toolchain/check/testdata/var/fail_not_copyable.carbon index 6eece687e14d..262d812e48e4 100644 --- a/toolchain/check/testdata/var/fail_not_copyable.carbon +++ b/toolchain/check/testdata/var/fail_not_copyable.carbon @@ -34,7 +34,7 @@ fn F(x: X) { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.X = %X.decl, .F = %F} [template] +// CHECK:STDOUT: package: = namespace {.X = %X.decl, .F = %F} [template] // CHECK:STDOUT: %X.decl = class_decl @X, () // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/var/fail_storage_is_literal.carbon b/toolchain/check/testdata/var/fail_storage_is_literal.carbon index b2af2147e6da..bc136487f917 100644 --- a/toolchain/check/testdata/var/fail_storage_is_literal.carbon +++ b/toolchain/check/testdata/var/fail_storage_is_literal.carbon @@ -18,7 +18,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/fail_todo_modifiers.carbon b/toolchain/check/testdata/var/fail_todo_modifiers.carbon index cc9d8c77dfd3..372c45767857 100644 --- a/toolchain/check/testdata/var/fail_todo_modifiers.carbon +++ b/toolchain/check/testdata/var/fail_todo_modifiers.carbon @@ -12,7 +12,7 @@ private var a: i32; // CHECK:STDOUT: --- fail_todo_modifiers.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.a = %a} [template] +// CHECK:STDOUT: package: = namespace {.a = %a} [template] // CHECK:STDOUT: %a.var: ref i32 = var a // CHECK:STDOUT: %a: ref i32 = bind_name a, %a.var // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/var/global_decl.carbon b/toolchain/check/testdata/var/global_decl.carbon index c73d4428240c..174a3bbd2074 100644 --- a/toolchain/check/testdata/var/global_decl.carbon +++ b/toolchain/check/testdata/var/global_decl.carbon @@ -9,7 +9,7 @@ var x: i32; // CHECK:STDOUT: --- global_decl.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: } diff --git a/toolchain/check/testdata/var/global_decl_with_init.carbon b/toolchain/check/testdata/var/global_decl_with_init.carbon index 73b6ef505a17..005f759e2a43 100644 --- a/toolchain/check/testdata/var/global_decl_with_init.carbon +++ b/toolchain/check/testdata/var/global_decl_with_init.carbon @@ -13,7 +13,7 @@ var x: i32 = 0; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x} [template] +// CHECK:STDOUT: package: = namespace {.x = %x} [template] // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %.loc7: i32 = int_literal 0 [template = constants.%.1] diff --git a/toolchain/check/testdata/var/global_lookup.carbon b/toolchain/check/testdata/var/global_lookup.carbon index 898d57119ddb..8e1980ebc41d 100644 --- a/toolchain/check/testdata/var/global_lookup.carbon +++ b/toolchain/check/testdata/var/global_lookup.carbon @@ -14,7 +14,7 @@ var y: i32 = x; // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .y = %y} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .y = %y} [template] // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %.loc7: i32 = int_literal 0 [template = constants.%.1] diff --git a/toolchain/check/testdata/var/global_lookup_in_scope.carbon b/toolchain/check/testdata/var/global_lookup_in_scope.carbon index 388dddc404c3..bc2eb49564dd 100644 --- a/toolchain/check/testdata/var/global_lookup_in_scope.carbon +++ b/toolchain/check/testdata/var/global_lookup_in_scope.carbon @@ -17,7 +17,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.x = %x, .Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.x = %x, .Main = %Main} [template] // CHECK:STDOUT: %x.var: ref i32 = var x // CHECK:STDOUT: %x: ref i32 = bind_name x, %x.var // CHECK:STDOUT: %.loc7: i32 = int_literal 0 [template = constants.%.1] diff --git a/toolchain/check/testdata/var/lookup.carbon b/toolchain/check/testdata/var/lookup.carbon index 0ff266e47173..3d1e2dde777a 100644 --- a/toolchain/check/testdata/var/lookup.carbon +++ b/toolchain/check/testdata/var/lookup.carbon @@ -16,7 +16,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/var/shadowing.carbon b/toolchain/check/testdata/var/shadowing.carbon index 9f1a067e4093..6e663a8e5220 100644 --- a/toolchain/check/testdata/var/shadowing.carbon +++ b/toolchain/check/testdata/var/shadowing.carbon @@ -23,7 +23,7 @@ fn Main() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Main = %Main} [template] +// CHECK:STDOUT: package: = namespace {.Main = %Main} [template] // CHECK:STDOUT: %Main: = fn_decl @Main [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/break_continue.carbon b/toolchain/check/testdata/while/break_continue.carbon index 0788efc366ce..b4c69703582b 100644 --- a/toolchain/check/testdata/while/break_continue.carbon +++ b/toolchain/check/testdata/while/break_continue.carbon @@ -29,7 +29,7 @@ fn While() { // CHECK:STDOUT: --- break_continue.carbon // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.A = %A, .B = %B, .C = %C, .D = %D, .E = %E, .F = %F, .G = %G, .H = %H, .While = %While} [template] +// CHECK:STDOUT: package: = namespace {.A = %A, .B = %B, .C = %C, .D = %D, .E = %E, .F = %F, .G = %G, .H = %H, .While = %While} [template] // CHECK:STDOUT: %A: = fn_decl @A [template] // CHECK:STDOUT: %B: = fn_decl @B [template] // CHECK:STDOUT: %C: = fn_decl @C [template] diff --git a/toolchain/check/testdata/while/fail_bad_condition.carbon b/toolchain/check/testdata/while/fail_bad_condition.carbon index 1947e418d8e4..0edd38036334 100644 --- a/toolchain/check/testdata/while/fail_bad_condition.carbon +++ b/toolchain/check/testdata/while/fail_bad_condition.carbon @@ -19,7 +19,7 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.While = %While} [template] +// CHECK:STDOUT: package: = namespace {.While = %While} [template] // CHECK:STDOUT: %While: = fn_decl @While [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/fail_break_continue.carbon b/toolchain/check/testdata/while/fail_break_continue.carbon index e31bd0b0631f..8f806d689696 100644 --- a/toolchain/check/testdata/while/fail_break_continue.carbon +++ b/toolchain/check/testdata/while/fail_break_continue.carbon @@ -34,7 +34,7 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.While = %While} [template] +// CHECK:STDOUT: package: = namespace {.While = %While} [template] // CHECK:STDOUT: %While: = fn_decl @While [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/check/testdata/while/unreachable_end.carbon b/toolchain/check/testdata/while/unreachable_end.carbon index fd33fdfe745d..35478715edf8 100644 --- a/toolchain/check/testdata/while/unreachable_end.carbon +++ b/toolchain/check/testdata/while/unreachable_end.carbon @@ -26,7 +26,7 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Cond = %Cond, .F = %F, .G = %G, .H = %H, .While = %While} [template] +// CHECK:STDOUT: package: = namespace {.Cond = %Cond, .F = %F, .G = %G, .H = %H, .While = %While} [template] // CHECK:STDOUT: %Cond: = fn_decl @Cond [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] diff --git a/toolchain/check/testdata/while/while.carbon b/toolchain/check/testdata/while/while.carbon index 6a3b9e91ed4b..47fc7ff2a716 100644 --- a/toolchain/check/testdata/while/while.carbon +++ b/toolchain/check/testdata/while/while.carbon @@ -25,7 +25,7 @@ fn While() { // CHECK:STDOUT: } // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {.Cond = %Cond, .F = %F, .G = %G, .H = %H, .While = %While} [template] +// CHECK:STDOUT: package: = namespace {.Cond = %Cond, .F = %F, .G = %G, .H = %H, .While = %While} [template] // CHECK:STDOUT: %Cond: = fn_decl @Cond [template] // CHECK:STDOUT: %F: = fn_decl @F [template] // CHECK:STDOUT: %G: = fn_decl @G [template] diff --git a/toolchain/driver/testdata/stdin.carbon b/toolchain/driver/testdata/stdin.carbon index 9ea14e340b43..cdb2bdfdc4a6 100644 --- a/toolchain/driver/testdata/stdin.carbon +++ b/toolchain/driver/testdata/stdin.carbon @@ -9,6 +9,6 @@ // CHECK:STDOUT: --- // CHECK:STDOUT: // CHECK:STDOUT: file { -// CHECK:STDOUT: package: = namespace package, {} [template] +// CHECK:STDOUT: package: = namespace {} [template] // CHECK:STDOUT: } // CHECK:STDOUT: diff --git a/toolchain/sem_ir/formatter.cpp b/toolchain/sem_ir/formatter.cpp index 7a86962bb597..000325b8fac2 100644 --- a/toolchain/sem_ir/formatter.cpp +++ b/toolchain/sem_ir/formatter.cpp @@ -848,6 +848,14 @@ class Formatter { FormatLabel(inst.block_id); } + auto FormatInstructionRHS(Namespace inst) -> void { + if (inst.import_id.is_valid()) { + FormatArgs(inst.name_scope_id, inst.import_id); + } else { + FormatArgs(inst.name_scope_id); + } + } + auto FormatInstruction(InstId /*inst_id*/, BranchIf inst) -> void { if (!in_terminator_sequence_) { Indent(); diff --git a/toolchain/sem_ir/typed_insts.h b/toolchain/sem_ir/typed_insts.h index 7ef9774e5d44..0df5d4ca744f 100644 --- a/toolchain/sem_ir/typed_insts.h +++ b/toolchain/sem_ir/typed_insts.h @@ -481,8 +481,8 @@ struct Namespace { InstKind::Namespace.Define("namespace"); TypeId type_id; - NameId name_id; NameScopeId name_scope_id; + InstId import_id; }; struct Param { diff --git a/toolchain/sem_ir/value_stores.h b/toolchain/sem_ir/value_stores.h index 6503ba897ca8..0f8db45811cf 100644 --- a/toolchain/sem_ir/value_stores.h +++ b/toolchain/sem_ir/value_stores.h @@ -314,6 +314,9 @@ struct NameScope : Printable { // The instruction which owns the scope. InstId inst_id; + // When the scope is a namespace, the name. Otherwise, invalid. + NameId name_id; + // The scope enclosing this one. NameScopeId enclosing_scope_id; @@ -329,9 +332,11 @@ struct NameScope : Printable { class NameScopeStore { public: // Adds a name scope, returning an ID to reference it. - auto Add(InstId inst_id, NameScopeId enclosing_scope_id) -> NameScopeId { - return values_.Add( - {.inst_id = inst_id, .enclosing_scope_id = enclosing_scope_id}); + auto Add(InstId inst_id, NameId name_id, NameScopeId enclosing_scope_id) + -> NameScopeId { + return values_.Add({.inst_id = inst_id, + .name_id = name_id, + .enclosing_scope_id = enclosing_scope_id}); } // Returns the requested name scope.