carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-06 10:54:49 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Rename and rearrange entities in tests to avoid name reuse (#7656)

Browse Source 
Fix a bunch of cases where we use the same external name to mean
multiple different things in the same test. We've historically gotten
away with this, but under `--share-cpp-ast`, it becomes an error, at
least if the entity is either defined in, or used from, C++ code.

Assisted-by: Gemini via Antigravity (original change) and Claude Code
(suggested edits in review)

---------

Co-authored-by: Chandler Carruth <chandlerc@gmail.com>
This commit is contained in:
Richard Smith
2026-08-21 01:36:40 +00:00
committed by GitHub
co-authored by Chandler Carruth
parent 6eb900dff5
commit c588eadb57
53 changed files with 7794 additions and 7705 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/interop/cpp/basics/inline/modules.carbon
Vendored
+12 -12
View File
@@ -38,21 +38,21 @@ library "[[@TEST_NAME]]";
// TODO: This diagnostic isn't very good.
import Cpp inline '''
// CHECK:STDERR: fail_module_in_inline_cpp.carbon:[[@LINE+15]]:1: error: module declaration must not come from an #include directive [CppInteropParseError]
// CHECK:STDERR: 21 | module Foo;
// CHECK:STDERR: 21 | module Bar;
// CHECK:STDERR: | ^~~~~~~~~~~
// CHECK:STDERR:
// CHECK:STDERR: fail_module_in_inline_cpp.carbon:[[@LINE+11]]:1: error: module declaration must occur at the start of the translation unit [CppInteropParseError]
// CHECK:STDERR: 21 | module Foo;
// CHECK:STDERR: 21 | module Bar;
// CHECK:STDERR: | ^
// CHECK:STDERR: <carbon Cpp imports>:1:1: note: add 'module;' to the start of the file to introduce a global module fragment [CppInteropParseNote]
// CHECK:STDERR: 1 | ;
// CHECK:STDERR: | ^
// CHECK:STDERR:
// CHECK:STDERR: fail_module_in_inline_cpp.carbon:[[@LINE+4]]:8: error: module 'Foo' not found [CppInteropParseError]
// CHECK:STDERR: 21 | module Foo;
// CHECK:STDERR: | ^~~~
// CHECK:STDERR: fail_module_in_inline_cpp.carbon:[[@LINE+4]]:8: error: module name 'Foo' specified on command line does not match name of module [CppInteropParseError]
// CHECK:STDERR: 21 | module Bar;
// CHECK:STDERR: | ^~~
// CHECK:STDERR:
module Foo;
module Bar;
''';
// --- fail_global_module_in_inline_cpp.carbon
@@ -74,21 +74,21 @@ module;
int n;
// CHECK:STDERR: fail_global_module_in_inline_cpp.carbon:[[@LINE+15]]:1: error: module declaration must not come from an #include directive [CppInteropParseError]
// CHECK:STDERR: 33 | module Foo;
// CHECK:STDERR: 33 | module Baz;
// CHECK:STDERR: | ^~~~~~~~~~~
// CHECK:STDERR:
// CHECK:STDERR: fail_global_module_in_inline_cpp.carbon:[[@LINE+11]]:1: error: module declaration must occur at the start of the translation unit [CppInteropParseError]
// CHECK:STDERR: 33 | module Foo;
// CHECK:STDERR: 33 | module Baz;
// CHECK:STDERR: | ^
// CHECK:STDERR: <carbon Cpp imports>:1:1: note: add 'module;' to the start of the file to introduce a global module fragment [CppInteropParseNote]
// CHECK:STDERR: 1 | ;
// CHECK:STDERR: | ^
// CHECK:STDERR:
// CHECK:STDERR: fail_global_module_in_inline_cpp.carbon:[[@LINE+4]]:8: error: module 'Foo' not found [CppInteropParseError]
// CHECK:STDERR: 33 | module Foo;
// CHECK:STDERR: | ^~~~
// CHECK:STDERR: fail_global_module_in_inline_cpp.carbon:[[@LINE+4]]:8: error: module name 'Foo' specified on command line does not match name of module [CppInteropParseError]
// CHECK:STDERR: 33 | module Baz;
// CHECK:STDERR: | ^~~
// CHECK:STDERR:
module Foo;
module Baz;
''';
// --- fail_import_in_inline_cpp.carbon