Skip to content

[Swift Next] Fix PrintName calls -> printNext #38182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/Driver/Driver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3539,7 +3539,7 @@ void Driver::printHelp(bool ShowHidden) const {
if (!ShowHidden)
ExcludedFlagsBitmask |= HelpHidden;

getOpts().PrintHelp(llvm::outs(), Name.c_str(), "Swift compiler",
getOpts().printHelp(llvm::outs(), Name.c_str(), "Swift compiler",
IncludedFlagsBitmask, ExcludedFlagsBitmask,
/*ShowAllAliases*/false);

Expand Down
2 changes: 1 addition & 1 deletion lib/FrontendTool/FrontendTool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2102,7 +2102,7 @@ int swift::performFrontend(ArrayRef<const char *> Args,
Invocation.getFrontendOptions().PrintHelpHidden ? 0 :
llvm::opt::HelpHidden;
std::unique_ptr<llvm::opt::OptTable> Options(createSwiftOptTable());
Options->PrintHelp(llvm::outs(), displayName(MainExecutablePath).c_str(),
Options->printHelp(llvm::outs(), displayName(MainExecutablePath).c_str(),
"Swift frontend", IncludedFlagsBitmask,
ExcludedFlagsBitmask, /*ShowAllAliases*/false);
return finishDiagProcessing(0, /*verifierEnabled*/ false);
Expand Down
2 changes: 1 addition & 1 deletion tools/SourceKit/tools/sourcekitd-test/TestOptions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,6 @@ void TestOptions::printHelp(bool ShowHidden) const {

TestOptTable Table;

Table.PrintHelp(llvm::outs(), "sourcekitd-test [options] <inputs>",
Table.printHelp(llvm::outs(), "sourcekitd-test [options] <inputs>",
"SourceKit Testing Tool", ShowHidden);
}
2 changes: 1 addition & 1 deletion tools/driver/autolink_extract_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ class AutolinkExtractInvocation {
if (ParsedArgs.getLastArg(OPT_help)) {
std::string ExecutableName =
llvm::sys::path::stem(MainExecutablePath).str();
Table->PrintHelp(llvm::outs(), ExecutableName.c_str(),
Table->printHelp(llvm::outs(), ExecutableName.c_str(),
"Swift Autolink Extract", options::AutolinkExtractOption,
0, /*ShowAllAliases*/false);
return 1;
Expand Down
2 changes: 1 addition & 1 deletion tools/driver/modulewrap_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class ModuleWrapInvocation {
if (ParsedArgs.getLastArg(OPT_help)) {
std::string ExecutableName =
llvm::sys::path::stem(MainExecutablePath).str();
Table->PrintHelp(llvm::outs(), ExecutableName.c_str(),
Table->printHelp(llvm::outs(), ExecutableName.c_str(),
"Swift Module Wrapper", options::ModuleWrapOption, 0,
/*ShowAllAliases*/false);
return 1;
Expand Down
2 changes: 1 addition & 1 deletion tools/driver/swift_api_digester_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2649,7 +2649,7 @@ class SwiftAPIDigesterInvocation {
void printHelp() {
std::string ExecutableName =
llvm::sys::path::stem(MainExecutablePath).str();
Table->PrintHelp(llvm::outs(), ExecutableName.c_str(), "Swift API Digester",
Table->printHelp(llvm::outs(), ExecutableName.c_str(), "Swift API Digester",
/*IncludedFlagsBitmask*/ SwiftAPIDigesterOption,
/*ExcludedFlagsBitmask*/ 0,
/*ShowAllAliases*/ false);
Expand Down
2 changes: 1 addition & 1 deletion tools/driver/swift_api_extract_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class SwiftAPIExtractInvocation {
if (ParsedArgs.getLastArg(OPT_help)) {
std::string ExecutableName =
llvm::sys::path::stem(MainExecutablePath).str();
Table->PrintHelp(llvm::outs(), ExecutableName.c_str(),
Table->printHelp(llvm::outs(), ExecutableName.c_str(),
"Swift API Extract", options::SwiftAPIExtractOption, 0,
/*ShowAllAliases*/ false);
return 1;
Expand Down
2 changes: 1 addition & 1 deletion tools/driver/swift_indent_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class SwiftIndentInvocation {
if (ParsedArgs.getLastArg(OPT_help)) {
std::string ExecutableName =
llvm::sys::path::stem(MainExecutablePath).str();
Table->PrintHelp(llvm::outs(), ExecutableName.c_str(),
Table->printHelp(llvm::outs(), ExecutableName.c_str(),
"Swift Format Tool", options::SwiftIndentOption, 0,
/*ShowAllAliases*/false);
return 1;
Expand Down
2 changes: 1 addition & 1 deletion tools/driver/swift_symbolgraph_extract_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ int swift_symbolgraph_extract_main(ArrayRef<const char *> Args,
if (ParsedArgs.getLastArg(OPT_help) || Args.empty()) {
std::string ExecutableName =
llvm::sys::path::stem(MainExecutablePath).str();
Table->PrintHelp(llvm::outs(), ExecutableName.c_str(),
Table->printHelp(llvm::outs(), ExecutableName.c_str(),
"Swift Symbol Graph Extractor",
SwiftSymbolGraphExtractOption, 0,
/*ShowAllAliases*/ false);
Expand Down