Merge pull request #5224 from practicalswift/gardening-20161011

swift-ci · web-flow · commit 3ca2ed3c943d · 2016-10-11T03:40:23.000-07:00
diff --git a/include/swift/AST/DiagnosticsSema.def b/include/swift/AST/DiagnosticsSema.def
@@ -1950,8 +1950,6 @@ ERROR(noescape_implied_by_autoclosure,none,
 ERROR(noescape_conflicts_escaping_autoclosure,none,
       "@noescape conflicts with @autoclosure(escaping)", ())
 
-ERROR(escaping_function_type,none,
-      "@escaping may only be applied to parameters of function type", ())
 ERROR(escaping_non_function_parameter,none,
       "@escaping attribute may only be used in function parameter position", ())
 
diff --git a/lib/IRGen/GenConstant.cpp b/lib/IRGen/GenConstant.cpp
@@ -1,4 +1,4 @@
-//===--- GenConstant.cpp - Swift IR Generation For Constants ----*- C++ -*-===//
+//===--- GenConstant.cpp - Swift IR Generation For Constants --------------===//
 //
 // This source file is part of the Swift.org open source project
 //

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//===--- GenConstant.cpp - Swift IR Generation For Constants ----- C++ --===//`
	`1`	`+//===--- GenConstant.cpp - Swift IR Generation For Constants --------------===//`
`2`	`2`	`//`
`3`	`3`	`// This source file is part of the Swift.org open source project`
`4`	`4`	`//`