NCGenerics: implicit casts require 'consume'

It's better if this is an error from the start.

Author: kavon

include/swift/AST/DiagnosticsSema.def

@@ -7848,10 +7848,10 @@ ERROR(noncopyable_objc_enum, none,
       "noncopyable enums cannot be marked '@objc'", ())
 ERROR(moveOnly_not_allowed_here,none,
       "'@_moveOnly' attribute is only valid on structs or enums", ())
-WARNING(consume_expression_needed_for_cast,none,
+ERROR(consume_expression_needed_for_cast,none,
       "implicit conversion to %0 is consuming", (Type))
-NOTE(add_consume_to_silence_warning,none,
-     "add 'consume' to silence this warning", ())
+NOTE(add_consume_to_silence,none,
+     "add 'consume' to make consumption explicit", ())
 ERROR(consume_expression_not_passed_lvalue,none,
       "'consume' can only be applied to a local binding ('let', 'var', or parameter)", ())
 ERROR(consume_expression_partial_copyable,none,

lib/Sema/CSApply.cpp

@@ -5590,7 +5590,7 @@ namespace {
                       cs.getType(coercion));
         ctx.Diags
             .diagnose(coercion->getLoc(),
-                      diag::add_consume_to_silence_warning)
+                      diag::add_consume_to_silence)
             .fixItInsert(coercion->getStartLoc(), "consume ");
       }
     }

test/Sema/moveonly_casts.swift

@@ -19,13 +19,13 @@ func testExplicitCasts() {
 func testCalls() {
   let method = MethodSir()
   let foo = NC()
-  testBorrowing(foo) // expected-warning {{implicit conversion to 'NC?' is consuming}}
-                     // expected-note@-1 {{add 'consume' to silence this warning}} {{17-17=consume }}
+  testBorrowing(foo) // expected-error {{implicit conversion to 'NC?' is consuming}}
+                     // expected-note@-1 {{add 'consume' to make consumption explicit}} {{17-17=consume }}
   testBorrowing(consume foo)
   testBorrowing(foo as NC?)
 
-  method.borrow(foo) // expected-warning {{implicit conversion to 'NC?' is consuming}}
-                     // expected-note@-1 {{add 'consume' to silence this warning}} {{17-17=consume }}
+  method.borrow(foo) // expected-error {{implicit conversion to 'NC?' is consuming}}
+                     // expected-note@-1 {{add 'consume' to make consumption explicit}} {{17-17=consume }}
   method.borrow(consume foo)
 
   testConsuming(foo)
@@ -59,8 +59,8 @@ func delay(_ f: @autoclosure () -> NC?) -> NC? { f() }
 
 func testDelay() {
   let nc = NC()
-  let _ = delay(nc) // expected-warning {{implicit conversion to 'NC?' is consuming}}
-                    // expected-note@-1 {{add 'consume' to silence this warning}} {{17-17=consume }}
+  let _ = delay(nc) // expected-error {{implicit conversion to 'NC?' is consuming}}
+                    // expected-note@-1 {{add 'consume' to make consumption explicit}} {{17-17=consume }}
 }
 
 struct PropCity {
@@ -74,14 +74,14 @@ struct PropCity {
   func chk(_ t: borrowing NC!) {}
   func chkWithDefaultArg(_ oath: borrowing NC? = NC()) {}
   func test(_ nc: consuming NC) {
-    chk(nc) // expected-warning {{implicit conversion to 'NC?' is consuming}}
-            // expected-note@-1 {{add 'consume' to silence this warning}} {{9-9=consume }}
+    chk(nc) // expected-error {{implicit conversion to 'NC?' is consuming}}
+            // expected-note@-1 {{add 'consume' to make consumption explicit}} {{9-9=consume }}
 
     chk(consume nc)
 
     chkWithDefaultArg()
-    chkWithDefaultArg(nc) // expected-warning {{implicit conversion to 'NC?' is consuming}}
-                          // expected-note@-1 {{add 'consume' to silence this warning}} {{23-23=consume }}
+    chkWithDefaultArg(nc) // expected-error {{implicit conversion to 'NC?' is consuming}}
+                          // expected-note@-1 {{add 'consume' to make consumption explicit}} {{23-23=consume }}
   }
 }
 
@@ -93,16 +93,16 @@ func restockConsume(_ x: consuming any Veggie & ~Copyable) {}
 
 func checkExistential() {
   let carrot = Carrot()
-  restockBorrow(carrot) // expected-warning {{implicit conversion to 'any Veggie & ~Copyable' is consuming}}
-                        // expected-note@-1 {{add 'consume' to silence this warning}} {{17-17=consume }}
+  restockBorrow(carrot) // expected-error {{implicit conversion to 'any Veggie & ~Copyable' is consuming}}
+                        // expected-note@-1 {{add 'consume' to make consumption explicit}} {{17-17=consume }}
   restockBorrow(consume carrot)
 
   restockConsume(carrot)
 }
 
 func genericErasure<T: Veggie & ~Copyable>(_ veg: consuming T) {
-  restockBorrow(veg) // expected-warning {{implicit conversion to 'any Veggie & ~Copyable' is consuming}}
-                     // expected-note@-1 {{add 'consume' to silence this warning}} {{17-17=consume }}
+  restockBorrow(veg) // expected-error {{implicit conversion to 'any Veggie & ~Copyable' is consuming}}
+                     // expected-note@-1 {{add 'consume' to make consumption explicit}} {{17-17=consume }}
   restockBorrow(consume veg)
   restockBorrow(veg as any Veggie & ~Copyable)
   restockConsume(veg)
@@ -115,12 +115,11 @@ extension Veggie where Self: ~Copyable {
 }
 extension Carrot {
   consuming func check() {
-    inspect(self) // expected-warning {{implicit conversion to 'any Veggie & ~Copyable' is consuming}}
-                  // expected-note@-1 {{add 'consume' to silence this warning}} {{13-13=consume }}
+    inspect(self) // expected-error {{implicit conversion to 'any Veggie & ~Copyable' is consuming}}
+                  // expected-note@-1 {{add 'consume' to make consumption explicit}} {{13-13=consume }}
     inspect(consume self)
     inspect(self as any Veggie & ~Copyable)
 
     let _: any Veggie & ~Copyable = self
   }
 }
-