Merge pull request swiftlang#20601 from milseman/stringinable

swift-ci · web-flow · commit d6a9f308827f · 2018-11-15T12:09:03.000-08:00
diff --git a/stdlib/public/core/StringCharacterView.swift b/stdlib/public/core/StringCharacterView.swift
@@ -50,7 +50,6 @@ extension String: BidirectionalCollection {
   }
 
   /// The number of characters in a string.
-  @inlinable // FIXME(inline-always)
   public var count: Int {
     @inline(__always) get {
       return distance(from: startIndex, to: endIndex)
diff --git a/stdlib/public/core/StringGutsRangeReplaceable.swift b/stdlib/public/core/StringGutsRangeReplaceable.swift
@@ -40,8 +40,7 @@ extension _StringGuts {
     }
   }
 
-  @inlinable // FIXME(inline-always) was usableFromInline
-  // @testable
+  @usableFromInline // @testable
   internal var isUniqueNative: Bool {
     @inline(__always) mutating get {
       // Note: mutating so that self is `inout`.

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,6 @@ extension String: BidirectionalCollection {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`/// The number of characters in a string.`
`53`		`- @inlinable // FIXME(inline-always)`
`54`	`53`	`public var count: Int {`
`55`	`54`	`@inline(__always) get {`
`56`	`55`	`return distance(from: startIndex, to: endIndex)`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,7 @@ extension _StringGuts {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- @inlinable // FIXME(inline-always) was usableFromInline`
`44`		`- // @testable`
	`43`	`+ @usableFromInline // @testable`
`45`	`44`	`internal var isUniqueNative: Bool {`
`46`	`45`	`@inline(__always) mutating get {`
`47`	`46`	// Note: mutating so that self is `inout`.