averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Serialization] Shorten and fix reference to wrong module in note

Browse Source
This commit is contained in:
Alexis Laferrière
2021-04-08 16:34:33 -07:00
parent 4de232ec57
commit a3b848b3c1
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Serialization/Deserialization.cpp
View File

@@ -1528,11 +1528,9 @@ ModuleFile::resolveCrossReference(ModuleID MID, uint32_t pathLen) {
// Found a full match in a different module. It should be a different
// one because otherwise it would have succeeded on the first search.
// This is usually caused by the use of poorly modularized headers.
auto line = "'" +
auto line = "There is a matching '" +
declName.getString(strScratch).str() +
"' was not found in module '" +
std::string(baseModule->getName().str()) +
"', but there is one in module '" +
"' in module '" +
std::string(nameAndModule.first.str()) +
"'. If this is imported from clang, please make sure " +
"the header is part of a single clang module.";
@@ -1545,7 +1543,7 @@ ModuleFile::resolveCrossReference(ModuleID MID, uint32_t pathLen) {
auto line = "'" +
declName.getString(strScratch).str() +
"' in module '" +
std::string(baseModule->getName().str()) +
std::string(nameAndModule.first.str()) +
"' was filtered out.";
notes.emplace_back(line);
}