Merge pull request #40305 from compnerd/semitruck

gardening: make c++98-compat-extra-semi an error
This commit is contained in:
Saleem Abdulrasool
2021-11-30 08:18:36 -08:00
committed by GitHub
61 changed files with 99 additions and 93 deletions

View File

@@ -378,7 +378,7 @@ static bool printModuleInterfaceDecl(Decl *D,
/// Sorts import declarations for display.
static bool compareImports(ImportDecl *LHS, ImportDecl *RHS) {
return LHS->getImportPath() < RHS->getImportPath();
};
}
/// Sorts Swift declarations for display.
static bool compareSwiftDecls(Decl *LHS, Decl *RHS) {
@@ -393,7 +393,7 @@ static bool compareSwiftDecls(Decl *LHS, Decl *RHS) {
// FIXME: not sufficient to establish a total order for overloaded decls.
}
return LHS->getKind() < RHS->getKind();
};
}
static std::pair<ArrayRef<Decl*>, ArrayRef<Decl*>>
getDeclsFromCrossImportOverlay(ModuleDecl *Overlay, ModuleDecl *Declaring,