Skip to content

Commit 07357b9

Browse files
authored
Merge pull request #76431 from rjmansfield/remove-more-unused-diags
Remove additional unused diagnostics.
2 parents 1070279 + a097f9f commit 07357b9

File tree

6 files changed

+1
-14
lines changed

6 files changed

+1
-14
lines changed

include/swift/AST/DiagnosticsCommon.def

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,6 @@ ERROR(generic_signature_not_equal,none,
117117
"generic signature %0 is not equal to new signature %1",
118118
(StringRef, StringRef))
119119

120-
// Used in diagnostics that are split across requests implemented in several places.
121-
ERROR(concurrency_default_actor_not_found,none,
122-
"broken standard library: cannot find default actor type '%0'", (StringRef))
123-
124120
// FIXME: Used by swift-api-digester. Don't want to set up a separate diagnostics
125121
// file just for a few errors.
126122
ERROR(sdk_node_unrecognized_key,none,

include/swift/AST/DiagnosticsDriver.def

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,6 @@ ERROR(error_darwin_static_stdlib_not_supported, none,
133133
WARNING(warn_darwin_link_objc_deprecated, none,
134134
"-link-objc-runtime is no longer supported on Apple platforms", ())
135135

136-
ERROR(error_darwin_only_supports_libcxx, none,
137-
"The only C++ standard library supported on Apple platforms is libc++",
138-
())
139-
140136
ERROR(error_wasm_doesnt_support_global_base, none,
141137
"The --global-base argument is not supported when targeting WebAssembly",
142138
())

include/swift/AST/DiagnosticsFrontend.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,6 @@ REMARK(replay_output, none, "replay output file '%0': key '%1'", (StringRef, Str
506506
REMARK(output_cache_miss, none, "cache miss for input file '%0': key '%1'", (StringRef, StringRef))
507507

508508
// CAS related diagnostics
509-
ERROR(error_invalid_cas_id, none, "invalid CASID '%0' (%1)", (StringRef, StringRef))
510509
ERROR(error_cas, none, "CAS error encountered: %0", (StringRef))
511510

512511
ERROR(error_failed_cached_diag, none, "failed to serialize cached diagnostics: %0", (StringRef))

include/swift/AST/DiagnosticsParse.def

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1840,8 +1840,6 @@ ERROR(attr_rawlayout_expected_integer_size,none,
18401840
"expected integer literal size in @_rawLayout attribute", ())
18411841
ERROR(attr_rawlayout_expected_integer_alignment,none,
18421842
"expected integer literal alignment in @_rawLayout attribute", ())
1843-
ERROR(attr_rawlayout_expected_integer_count,none,
1844-
"expected integer literal count in @_rawLayout attribute", ())
18451843
ERROR(attr_rawlayout_expected_params,none,
18461844
"expected %1 argument after %0 argument in @_rawLayout attribute", (StringRef, StringRef))
18471845

include/swift/AST/DiagnosticsSema.def

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7960,8 +7960,6 @@ ERROR(lifetime_dependence_immortal_alone, none,
79607960
// MARK: Sending
79617961
//===----------------------------------------------------------------------===//
79627962

7963-
ERROR(sending_unsupported_param_specifier, none,
7964-
"'%0' cannot be applied to a 'sending' parameter", (StringRef))
79657963
ERROR(sending_only_on_parameters_and_results, none,
79667964
"'sending' may only be used on parameters and results", ())
79677965
ERROR(sending_cannot_be_applied_to_tuple_elt, none,

lib/Frontend/Frontend.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ bool CompilerInstance::setup(const CompilerInvocation &Invoke,
564564
setupStatsReporter();
565565

566566
if (setupDiagnosticVerifierIfNeeded()) {
567-
Error = "Setting up diagnostics verified failed";
567+
Error = "Setting up diagnostics verifier failed";
568568
return true;
569569
}
570570

0 commit comments

Comments
 (0)