averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17691 from rudkx/remove-swift-3-in-expr-typechecking

Browse Source 
Remove support for -swift-version 3 from the expression type checker.
This commit is contained in:
Mark Lacey
2018-07-14 19:03:56 -07:00
committed by GitHub
parent 51f8c93f58 a5a1a63ed6
commit eb57e209e3
12 changed files with 29 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/swift/AST/DiagnosticsSema.def
View File

@@ -294,12 +294,6 @@ ERROR(err_noescape_param_call,none,
"parameter %0 to a call to a non-escaping function parameter can allow "
"re-entrant modification of a variable",
(DeclName, unsigned))
WARNING(warn_noescape_param_call,none,
"passing a %select{|closure which captures a }1non-escaping function "
"parameter %0 to a call to a non-escaping function parameter can allow "
"re-entrant modification of a variable and will be illegal in Swift 4",
(DeclName, unsigned))
ERROR(cannot_call_function_value,none,
"cannot invoke value of function type with argument list '%0'",
(StringRef))
@@ -924,10 +918,6 @@ ERROR(missing_unwrap_optional_try,none,
ERROR(missing_forced_downcast,none,
"%0 is not convertible to %1; "
"did you mean to use 'as!' to force downcast?", (Type, Type))
WARNING(missing_forced_downcast_swift3_compat_warning,none,
"bridging %0 to %1 may fail at runtime and will become a checked "
"cast in Swift 4; did you mean to use 'as!' to force downcast?",
(Type, Type))
ERROR(missing_explicit_conversion,none,
"%0 is not implicitly convertible to %1; "
"did you mean to use 'as' to explicitly convert?", (Type, Type))
@@ -2866,18 +2856,11 @@ WARNING(store_in_willset,none,
"attempting to store to property %0 within its own willSet, which is "
"about to be overwritten by the new value", (Identifier))
ERROR(tuple_splat_use,none,
"passing %0 arguments to a callee as a single tuple value has been removed in Swift 3",
(unsigned))
ERROR(value_of_module_type,none,
"expected module member name after module name", ())
ERROR(value_of_metatype_type,none,
"expected member name or constructor call after type name", ())
WARNING(warn_value_of_metatype_missing_self,none,
"missing '.self' for reference to metatype of type %0", (Type))
NOTE(add_parens_to_type,none,
"add arguments after the type to construct a value of the type", ())

11
include/swift/AST/Expr.h
View File

@@ -2,7 +2,7 @@
//
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
// Licensed under Apache License v2.0 with Runtime Library Exception
//
// See https://swift.org/LICENSE.txt for license information
@@ -93,15 +93,8 @@ enum class CheckedCastKind : unsigned {
SetDowncast,
/// A bridging conversion that always succeeds.
BridgingCoercion,
/// A bridging conversion that may fail, because there are multiple Swift
/// value types that bridge to the same Cocoa object type.
///
/// This kind is only used for Swift 3 compatibility diagnostics and is
/// treated the same as 'BridgingCoercion' otherwise. In Swift 4 or later,
/// any conversions with this kind show up as ValueCasts.
Swift3BridgingDowncast,
Last_CheckedCastKind = Swift3BridgingDowncast,
Last_CheckedCastKind = BridgingCoercion,
};
/// What are the high-level semantics of this access?