Merge pull request #67902 from kavon/remove-forget-spelling

remove support for `_forget`, the old spelling of `discard`

Author: kavon

include/swift/AST/DiagnosticsParse.def

@@ -1104,10 +1104,6 @@ ERROR(expected_expr_throw,PointsToFirstBadToken,
 // Discard Statement
 ERROR(expected_expr_discard,PointsToFirstBadToken,
       "expected expression in 'discard' statement", ())
-WARNING(forget_is_deprecated,PointsToFirstBadToken,
-      "'_forget' keyword is deprecated and will be removed soon; "
-      "use 'discard' instead",
-      ())
 
 // Await/Async
 ERROR(expected_await_not_async,none,

include/swift/AST/TokenKinds.def

@@ -257,7 +257,6 @@ MISC(raw_string_delimiter)
 MISC(string_segment)
 MISC(string_interpolation_anchor)
 MISC(kw_yield)
-MISC(kw_forget)
 MISC(kw_discard)
 
 // The following tokens are irrelevant for swiftSyntax and thus only declared 

include/swift/Parse/Parser.h

@@ -613,8 +613,7 @@ class Parser {
   /// a nice diagnostic.
   bool isContextualDiscardKeyword() {
     // must be `discard` ...
-    if (!(Tok.isContextualKeyword("_forget") // NOTE: support for deprecated _forget
-        || Tok.isContextualKeyword("discard")))
+    if (!Tok.isContextualKeyword("discard"))
       return false;
 
     // followed by either an identifier, `self`, or `Self`.

lib/Parse/ParseStmt.cpp

@@ -55,7 +55,6 @@ bool Parser::isStartOfStmt() {
   case tok::kw_case:
   case tok::kw_default:
   case tok::kw_yield:
-  case tok::kw_forget: // NOTE: support for deprecated _forget
   case tok::kw_discard:
   case tok::pound_assert:
   case tok::pound_if:
@@ -560,11 +559,7 @@ ParserResult<Stmt> Parser::parseStmt() {
   if (isContextualYieldKeyword()) {
     Tok.setKind(tok::kw_yield);
   } else if (isContextualDiscardKeyword()) {
-    // NOTE: support for deprecated _forget
-    if (Tok.isContextualKeyword("_forget"))
-      Tok.setKind(tok::kw_forget);
-    else
-      Tok.setKind(tok::kw_discard);
+    Tok.setKind(tok::kw_discard);
   }
 
   // This needs to handle everything that `Parser::isStartOfStmt()` accepts as
@@ -619,7 +614,6 @@ ParserResult<Stmt> Parser::parseStmt() {
   case tok::kw_for:
     if (tryLoc.isValid()) diagnose(tryLoc, diag::try_on_stmt, Tok.getText());
     return parseStmtForEach(LabelInfo);
-  case tok::kw_forget: // NOTE: support for deprecated _forget
   case tok::kw_discard:
     if (LabelInfo) diagnose(LabelInfo.Loc, diag::invalid_label_on_stmt);
     if (tryLoc.isValid()) diagnose(tryLoc, diag::try_on_stmt, Tok.getText());
@@ -942,16 +936,7 @@ ParserResult<Stmt> Parser::parseStmtThrow(SourceLoc tryLoc) {
 ///   'discard' 'self'
 ///
 ParserResult<Stmt> Parser::parseStmtDiscard() {
-  SourceLoc discardLoc;
-
-  // NOTE: support for deprecated _forget
-  if (Tok.is(tok::kw_forget)) {
-    discardLoc = consumeToken(tok::kw_forget);
-    diagnose(discardLoc, diag::forget_is_deprecated)
-        .fixItReplace(discardLoc, "discard");
-  } else {
-    discardLoc = consumeToken(tok::kw_discard);
-  }
+  SourceLoc discardLoc = consumeToken(tok::kw_discard);
 
   SourceLoc exprLoc;
   if (Tok.isNot(tok::eof))

test/ModuleInterface/discard_interface.swift

@@ -3,26 +3,16 @@
 // RUN: %target-swift-typecheck-module-from-interface(%t/Library.swiftinterface) -I %t -enable-experimental-feature MoveOnlyResilientTypes
 // RUN: %FileCheck %s < %t/Library.swiftinterface
 
-// This test makes sure that discard and _forget are emitted correctly in the
-// interfaces. We expect that if you use the old name _forget, you'll get that
-// in the interface file.
+// This test makes sure that discard is emitted correctly in the interfaces.
 
 // CHECK: @_alwaysEmitIntoClient public consuming func AEIC_discard() { discard self }
 // CHECK: @inlinable public consuming func inlinable_discard() { discard self }
 
-// CHECK: @_alwaysEmitIntoClient public consuming func AEIC_forget() { _forget self }
-// CHECK: @inlinable public consuming func inlinable_forget() { _forget self }
-
 public struct MoveOnlyStruct: ~Copyable {
   let x = 0
 
   @_alwaysEmitIntoClient public consuming func AEIC_discard() { discard self }
   @inlinable public consuming func inlinable_discard() { discard self }
 
-  @_alwaysEmitIntoClient public consuming func AEIC_forget() { _forget self }
-  // expected-warning@-1 {{'_forget' keyword is deprecated and will be removed soon; use 'discard' instead}}
-  @inlinable public consuming func inlinable_forget() { _forget self }
-  // expected-warning@-1 {{'_forget' keyword is deprecated and will be removed soon; use 'discard' instead}}
-
   deinit {}
 }

test/Parse/discard.swift

@@ -33,6 +33,10 @@ func c() {
   discard self
 }
 
+func c() {
+  _forget self  // expected-error {{consecutive statements on a line must be separated by ';'}}
+}
+
 func c() {
   discard `self`
 }