From 0191db3ededb30ef3b10d9b51e735b7934d409ee Mon Sep 17 00:00:00 2001 From: Xi Ge Date: Fri, 17 Aug 2018 16:58:46 -0700 Subject: [PATCH] intermedia change. --- test/api-digester/source-stability.swift | 3 +- .../source-stability.swift.expected | 96 +++++++++++++++++-- 2 files changed, 88 insertions(+), 11 deletions(-) diff --git a/test/api-digester/source-stability.swift b/test/api-digester/source-stability.swift index 8febd705d2f..bef73153db0 100644 --- a/test/api-digester/source-stability.swift +++ b/test/api-digester/source-stability.swift @@ -1,10 +1,9 @@ // REQUIRES: OS=macosx // RUN: %empty-directory(%t.tmp) // mkdir %t.tmp/module-cache && mkdir %t.tmp/dummy.sdk -// RUN: %api-digester -dump-sdk -module Swift -o %t.tmp/current-stdlib.json -module-cache-path %t.tmp/module-cache -sdk %t.tmp/dummy.sdk -swift-version 3 +// RUN: %api-digester -dump-sdk -module Swift -o %t.tmp/current-stdlib.json -module-cache-path %t.tmp/module-cache -sdk %t.tmp/dummy.sdk // RUN: %api-digester -diagnose-sdk -input-paths %S/stdlib-stable.json -input-paths %t.tmp/current-stdlib.json >> %t.tmp/changes.txt // RUN: %clang -E -P -x c %S/source-stability.swift.expected -o - | sed '/^\s*$/d' > %t.tmp/source-stability.swift.expected // RUN: %clang -E -P -x c %t.tmp/changes.txt -o - | sed '/^\s*$/d' > %t.tmp/changes.txt.tmp // RUN: diff -u %t.tmp/source-stability.swift.expected %t.tmp/changes.txt.tmp -// REQUIRES: rdar_43425867 diff --git a/test/api-digester/source-stability.swift.expected b/test/api-digester/source-stability.swift.expected index 854771cbd4e..f9e25810703 100644 --- a/test/api-digester/source-stability.swift.expected +++ b/test/api-digester/source-stability.swift.expected @@ -1,15 +1,93 @@ -/* FIXME: Bogus */ -TypeAlias DictionaryIterator.Element has been removed -TypeAlias SetIterator.Element has been removed -Var DictionaryIterator.customMirror has been removed -Var SetIterator.customMirror has been removed -Func DictionaryIterator.next() has been removed -Func SetIterator.next() has been removed -/* Renamed Decls (FIXME: Targets are Dictionary.Iterator & Set.Iterator) */ +/* Generic Signature Changes */ +Struct DictionaryIterator has generic signature change from to +Struct SetIterator has generic signature change from to + +/* RawRepresentable Changes */ + +/* Removed Decls */ +TypeAlias AbsoluteValuable has been removed +TypeAlias BitwiseOperations has been removed (deprecated) +TypeAlias DictionaryIterator.Element has been removed +TypeAlias IntMax has been removed +TypeAlias Integer has been removed +TypeAlias IntegerArithmetic has been removed +TypeAlias SetIterator.Element has been removed +TypeAlias SignedNumber has been removed +TypeAlias StringProtocol.UTF16Index has been removed (deprecated) +TypeAlias StringProtocol.UTF8Index has been removed (deprecated) +TypeAlias StringProtocol.UnicodeScalarIndex has been removed (deprecated) +TypeAlias UIntMax has been removed +Var DictionaryIterator.customMirror has been removed +Var FixedWidthInteger.allZeros has been removed (deprecated) +Var SetIterator.customMirror has been removed +Constructor Int.init(truncatingBitPattern:) has been removed +Constructor Int16.init(truncatingBitPattern:) has been removed +Constructor Int32.init(truncatingBitPattern:) has been removed +Constructor Int8.init(truncatingBitPattern:) has been removed +Constructor String.init(_:obsoletedInSwift4:) has been removed +Constructor UInt.init(truncatingBitPattern:) has been removed +Constructor UInt16.init(truncatingBitPattern:) has been removed +Constructor UInt32.init(truncatingBitPattern:) has been removed +Constructor UInt8.init(truncatingBitPattern:) has been removed +Func BinaryInteger.toIntMax() has been removed +Func DictionaryIterator.next() has been removed +Func FixedWidthInteger.addWithOverflow(_:_:) has been removed +Func FixedWidthInteger.divideWithOverflow(_:_:) has been removed +Func FixedWidthInteger.multiplyWithOverflow(_:_:) has been removed +Func FixedWidthInteger.remainderWithOverflow(_:_:) has been removed +Func FixedWidthInteger.subtractWithOverflow(_:_:) has been removed +Func FloatingPoint.abs(_:) has been removed (deprecated) +Func FloatingPoint.add(_:) has been removed +Func FloatingPoint.adding(_:) has been removed +Func FloatingPoint.divide(by:) has been removed +Func FloatingPoint.divided(by:) has been removed +Func FloatingPoint.multiplied(by:) has been removed +Func FloatingPoint.multiply(by:) has been removed +Func FloatingPoint.negated() has been removed +Func FloatingPoint.subtract(_:) has been removed +Func FloatingPoint.subtracting(_:) has been removed +Func Int.toUIntMax() has been removed +Func Int16.toUIntMax() has been removed +Func Int32.toUIntMax() has been removed +Func Int64.toUIntMax() has been removed +Func Int8.toUIntMax() has been removed +Func Sequence.flatMap(_:) has been removed +Func SetIterator.next() has been removed +Func SignedNumeric.abs(_:) has been removed +Func String.UTF16View.distance(from:to:) has been removed +Func String.UTF16View.index(_:offsetBy:) has been removed +Func String.UTF16View.index(after:) has been removed +Func String.UTF8View.distance(from:to:) has been removed +Func String.UTF8View.index(_:offsetBy:) has been removed +Func String.UTF8View.index(after:) has been removed +Func String.UnicodeScalarView.distance(from:to:) has been removed +Func String.UnicodeScalarView.index(_:offsetBy:) has been removed +Func String.UnicodeScalarView.index(after:) has been removed +Func String.UnicodeScalarView.popFirst() has been removed (deprecated) +Func String.popFirst() has been removed (deprecated) +Func UInt.toIntMax() has been removed +Func UInt16.toIntMax() has been removed +Func UInt32.toIntMax() has been removed +Func UInt64.toIntMax() has been removed +Func UInt8.toIntMax() has been removed +Func UnsignedInteger.toUIntMax() has been removed + +/* Moved Decls */ + +/* Renamed Decls */ Struct DictionaryIterator has been renamed to Struct Iterator Struct SetIterator has been renamed to Struct Iterator +Func Dictionary.filter(_:obsoletedInSwift4:) has been renamed to Func Dictionary.filter(_:) +Func Set.filter(_:obsoletedInSwift4:) has been renamed to Func Set.filter(_:) -/* FIXME: Bogus */ +/* Type Changes */ +Var Dictionary.keys has declared type change from LazyMapCollection<[Key : Value], Key> to Dictionary.Keys +Var Dictionary.values has declared type change from LazyMapCollection<[Key : Value], Value> to Dictionary.Values +Constructor String.init(_:) has return type change from String? to String +Func Dictionary.filter(_:obsoletedInSwift4:) has return type change from [Dictionary.Element] to [Dictionary.Key : Dictionary.Value] Func Dictionary.makeIterator() has return type change from DictionaryIterator.Key, Dictionary.Value> to Dictionary.Iterator +Func Set.filter(_:obsoletedInSwift4:) has return type change from [Set.Element] to Set Func Set.makeIterator() has return type change from SetIterator to Set.Iterator + +/* Decl Attribute changes */