word-smith a diagnostic in preparation for it becoming a family.

Swift SVN r30668

Author: lattner

include/swift/AST/DiagnosticsSema.def

@@ -170,7 +170,7 @@ NOTE(suggest_partial_overloads,sema,none,
       "lists: %1", (StringRef, StringRef))
 
 ERROR(cannot_convert_to_return_type,sema,none,
-      "cannot convert return expression of type %0 to expected return type %1",
+      "cannot convert return expression of type %0 to return type %1",
       (Type,Type))
 
 ERROR(cannot_return_value_from_void_func,sema,none,

test/Constraints/bridging.swift

@@ -65,12 +65,12 @@ func bridgeToAnyObject(s: BridgedStruct) -> AnyObject {
 }
 
 func bridgeFromObjC(c: BridgedClass) -> BridgedStruct {
-  return c // expected-error{{cannot convert return expression of type 'BridgedClass' to expected return type 'BridgedStruct'}}
+  return c // expected-error{{cannot convert return expression of type 'BridgedClass' to return type 'BridgedStruct'}}
   return c as BridgedStruct
 }
 
 func bridgeFromObjCDerived(s: BridgedClassSub) -> BridgedStruct {
-  return s // expected-error{{cannot convert return expression of type 'BridgedClassSub' to expected return type 'BridgedStruct'}}
+  return s // expected-error{{cannot convert return expression of type 'BridgedClassSub' to return type 'BridgedStruct'}}
   return s as BridgedStruct
 }
 

test/Constraints/same_types.swift

@@ -75,7 +75,7 @@ func fail2<
   where
   T.Foo == U.Foo, T.Foo == X, U.Foo == Y // expected-error{{generic parameter 'Foo' cannot be equal to both 'X' and 'Y'}}
 >(t: T, u: U) -> (X, Y) {
-  return (t.foo, u.foo) // expected-error{{cannot convert return expression of type '(X, X)' to expected return type '(X, Y)'}}
+  return (t.foo, u.foo) // expected-error{{cannot convert return expression of type '(X, X)' to return type '(X, Y)'}}
 }
 
 func test4<T: Barrable where T.Bar == Y>(t: T) -> Y {
@@ -87,7 +87,7 @@ func fail3<
   where
   T.Bar == X // expected-error{{'X' does not conform to required protocol 'Fooable'}}
 >(t: T) -> X {
-  return t.bar // expected-error{{cannot convert return expression of type 'T.Bar' to expected return type 'X'}}
+  return t.bar // expected-error{{cannot convert return expression of type 'T.Bar' to return type 'X'}}
 }
 
 func test5<T: Barrable where T.Bar.Foo == X>(t: T) -> X {
@@ -108,7 +108,7 @@ func fail4<
   T.Bar == Y,
   T.Bar.Foo == Z // expected-error{{generic parameter 'Foo' cannot be equal to both 'Foo' (aka 'X') and 'Z'}}
 >(t: T) -> (Y, Z) {
-  return (t.bar, t.bar.foo) // expected-error{{cannot convert return expression of type '(Y, X)' to expected return type '(Y, Z)'}}
+  return (t.bar, t.bar.foo) // expected-error{{cannot convert return expression of type '(Y, X)' to return type '(Y, Z)'}}
 }
 
 // TODO: repeat diagnostic
@@ -118,7 +118,7 @@ func fail5<
   T.Bar.Foo == Z,
   T.Bar == Y // expected-error 2{{generic parameter 'Foo' cannot be equal to both 'Z' and 'Foo'}}
 >(t: T) -> (Y, Z) {
-  return (t.bar, t.bar.foo) // expected-error{{cannot convert return expression of type '(Y, X)' to expected return type '(Y, Z)'}}
+  return (t.bar, t.bar.foo) // expected-error{{cannot convert return expression of type '(Y, X)' to return type '(Y, Z)'}}
 }
 
 func test8<T: Fooable where T.Foo == X, T.Foo == Y>(t: T) {} // expected-error{{generic parameter 'Foo' cannot be equal to both 'X' and 'Y'}}
@@ -130,7 +130,7 @@ func testAssocTypeEquivalence<
 }
 
 func fail6<T where T == Int>(t: T) -> Int { // expected-error{{same-type requirement makes generic parameter 'T' non-generic}}
-  return t // expected-error{{cannot convert return expression of type 'T' to expected return type 'Int'}}
+  return t // expected-error{{cannot convert return expression of type 'T' to return type 'Int'}}
 }
 
 func test8<

test/Misc/misc_diagnostics.swift

@@ -33,7 +33,7 @@ var f2: Float = 3.0
 var dd: Double = f1 - f2 // expected-error{{'Float' is not convertible to 'Double'}}
 
 func f() -> Bool {
-  return 1 + 1 // expected-error{{cannot convert return expression of type 'Int' to expected return type 'Bool'}}
+  return 1 + 1 // expected-error{{cannot convert return expression of type 'Int' to return type 'Bool'}}
 }
 
 // Test that nested diagnostics are properly surfaced.
@@ -60,15 +60,15 @@ func retV() { return true } // expected-error {{unexpected non-void return value
 func retAI() -> Int {
     let a = [""]
     let b = [""]
-    return (a + b) // expected-error {{cannot convert return expression of type '[String]' to expected return type 'Int'}}
+    return (a + b) // expected-error {{cannot convert return expression of type '[String]' to return type 'Int'}}
 }
 
 func bad_return1() {
   return 42  // expected-error {{unexpected non-void return value in void function}}
 }
 
 func bad_return2() -> (Int, Int) {
-  return 42  // expected-error {{cannot convert return expression of type 'Int' to expected return type '(Int, Int)'}}
+  return 42  // expected-error {{cannot convert return expression of type 'Int' to return type '(Int, Int)'}}
 }
 
 // <rdar://problem/14096697> QoI: Diagnostics for trying to return values from void functions

test/decl/func/default-values.swift

@@ -24,7 +24,7 @@ func tupleTypes() {
 }
 
 func returnWithDefault() -> (a: Int, b: Int = 42) { // expected-error{{default argument not permitted in a tuple type}}
-  return 5 // expected-error{{cannot convert return expression of type 'Int' to expected return type '(a: Int, b: Int)'}}
+  return 5 // expected-error{{cannot convert return expression of type 'Int' to return type '(a: Int, b: Int)'}}
 }
 
 // Only the first parameter list of a curried function can have a

test/decl/func/dynamic_self.swift

@@ -43,7 +43,7 @@ class C1 {
   // Instance methods have a self of type Self.
   func f(b: Bool) -> Self {
     // FIXME: below diagnostic should complain about C1 -> Self conversion
-    if b { return C1(int: 5) } // expected-error{{cannot convert return expression of type 'C1' to expected return type 'Self'}}
+    if b { return C1(int: 5) } // expected-error{{cannot convert return expression of type 'C1' to return type 'Self'}}
 
     // One can use .dynamicType to attempt to construct an object of type Self.
     if !b { return self.dynamicType.init(int: 5) }

test/decl/subscript/addressors.swift

@@ -43,7 +43,7 @@ struct Repeated {
       return UnsafePointer(base)
     }
     unsafeAddress { // expected-error {{duplicate definition}}
-      return base // expected-error {{cannot convert return expression of type 'UnsafeMutablePointer<Int>' to expected return type 'UnsafePointer<Int>'}}
+      return base // expected-error {{cannot convert return expression of type 'UnsafeMutablePointer<Int>' to return type 'UnsafePointer<Int>'}}
     }
   }
 }

test/decl/subscript/subscripting.swift

@@ -62,7 +62,7 @@ struct Y1 {
 
   subscript(i: Int) -> Int {
     get {
-      return x // expected-error{{cannot convert return expression of type 'X' to expected return type 'Int'}}
+      return x // expected-error{{cannot convert return expression of type 'X' to return type 'Int'}}
     }
     set {
       x = newValue // expected-error{{cannot assign a value of type 'Int' to a value of type 'X'}}

test/decl/var/properties.swift

@@ -382,7 +382,7 @@ struct Y { }
 var y: Y
 var x20: X {
   get {
-    return y // expected-error{{cannot convert return expression of type 'Y' to expected return type 'X'}}
+    return y // expected-error{{cannot convert return expression of type 'Y' to return type 'X'}}
   }
   set {
     y = newValue // expected-error{{cannot assign a value of type 'X' to a value of type 'Y'}}
@@ -391,7 +391,7 @@ var x20: X {
 
 var x21: X {
   get {
-    return y // expected-error{{cannot convert return expression of type 'Y' to expected return type 'X'}}
+    return y // expected-error{{cannot convert return expression of type 'Y' to return type 'X'}}
   }
   set(v) {
     y = v // expected-error{{cannot assign a value of type 'X' to a value of type 'Y'}}