Skip to content

Commit 465d6a8

Browse files
committed
Fix LifetimeDependence diagnostic formatting
Remove incorrectly nested single quotes from the suggested fix.
1 parent 7d338f2 commit 465d6a8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

include/swift/AST/DiagnosticsSema.def

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8340,18 +8340,18 @@ ERROR(lifetime_dependence_feature_required_return, none,
83408340
ERROR(lifetime_dependence_feature_required_mutating, none,
83418341
"%0 cannot have a ~Escapable 'self'", (StringRef))
83428342
ERROR(lifetime_dependence_feature_required_inout, none,
8343-
"%0 cannot have a ~Escapable 'inout' parameter %1",
8343+
"%0 cannot have a ~Escapable 'inout' parameter '%1'",
83448344
// this arg list must be compatible with
83458345
// lifetime_dependence_cannot_infer_inout
8346-
(StringRef, Identifier))
8346+
(StringRef, StringRef))
83478347

83488348
ERROR(lifetime_dependence_cannot_infer_return, none,
83498349
"%0 with a ~Escapable result requires '@_lifetime(...)'", (StringRef))
83508350
ERROR(lifetime_dependence_cannot_infer_mutating, none,
83518351
"%0 with a ~Escapable 'self' requires '@_lifetime(self: ...)'", (StringRef))
83528352
ERROR(lifetime_dependence_cannot_infer_inout, none,
83538353
"%0 with a ~Escapable 'inout' parameter requires '@_lifetime(%1: ...)'",
8354-
(StringRef, Identifier))
8354+
(StringRef, StringRef))
83558355

83568356
//------------------------------------------------------------------------------
83578357
// MARK: Lifetime Dependence Inference - refinements to the requirements above

lib/AST/LifetimeDependence.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ class LifetimeDependenceChecker {
554554
})) {
555555
ctx.Diags.diagnose(param->getLoc(), diagID,
556556
{StringRef(diagnosticQualifier()),
557-
param->getName()});
557+
param->getName().str()});
558558
}
559559
}
560560
}

0 commit comments

Comments
 (0)