Merge pull request #1590 from glessard/update-lifetimes-feature

Update lifetimes feature (future)

Author: jmschonfeld

Package.swift

@@ -148,7 +148,7 @@ let package = Package(
           ] + wasiLibcCSettings,
           swiftSettings: [
             .enableExperimentalFeature("VariadicGenerics"),
-            .enableExperimentalFeature("LifetimeDependence"),
+            .enableExperimentalFeature("Lifetimes"),
             .enableExperimentalFeature("AddressableTypes"),
             .enableExperimentalFeature("AllowUnsafeAttribute"),
             .enableExperimentalFeature("BuiltinModule"),

Sources/FoundationEssentials/CMakeLists.txt

@@ -84,7 +84,7 @@ endif()
 
 target_compile_options(FoundationEssentials PRIVATE
     "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -enable-experimental-feature -Xfrontend VariadicGenerics>"
-    "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -enable-experimental-feature -Xfrontend LifetimeDependence>"
+    "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -enable-experimental-feature -Xfrontend Lifetimes>"
     "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -enable-experimental-feature -Xfrontend AddressableTypes>"
     "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -enable-experimental-feature -Xfrontend BuiltinModule>"
     "SHELL:$<$<COMPILE_LANGUAGE:Swift>:-Xfrontend -enable-experimental-feature -Xfrontend AccessLevelOnImport>"

Sources/FoundationEssentials/Data/Data+Reading.swift

@@ -193,7 +193,7 @@ struct ReadBytesResult {
 }
 
 #if os(Windows)
-@lifetime(pBuffer: copy pBuffer)
+@_lifetime(pBuffer: copy pBuffer)
 private func read(from hFile: HANDLE, at path: PathOrURL,
                   into pBuffer: inout OutputRawSpan,
                   chunkSize dwChunk: Int = 4096, progress bProgress: Bool)

Sources/FoundationEssentials/Data/Data.swift

@@ -353,7 +353,7 @@ public struct Data : RandomAccessCollection, MutableCollection, RangeReplaceable
     @available(macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2, *)
     @_alwaysEmitIntoClient
     public var bytes: RawSpan {
-        @lifetime(borrow self)
+        @_lifetime(borrow self)
         borrowing get {
             let buffer: UnsafeRawBufferPointer
             switch _representation {
@@ -381,7 +381,7 @@ public struct Data : RandomAccessCollection, MutableCollection, RangeReplaceable
     @available(macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2, *)
     @_alwaysEmitIntoClient
     public var span: Span<UInt8> {
-        @lifetime(borrow self)
+        @_lifetime(borrow self)
         borrowing get {
             let span = unsafe bytes._unsafeView(as: UInt8.self)
             return _overrideLifetime(span, borrowing: self)
@@ -391,7 +391,7 @@ public struct Data : RandomAccessCollection, MutableCollection, RangeReplaceable
     @available(macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2, *)
     @_alwaysEmitIntoClient
     public var mutableBytes: MutableRawSpan {
-        @lifetime(&self)
+        @_lifetime(&self)
         mutating get {
             let buffer: UnsafeMutableRawBufferPointer
             switch _representation {
@@ -427,7 +427,7 @@ public struct Data : RandomAccessCollection, MutableCollection, RangeReplaceable
     @available(macOS 10.14.4, iOS 12.2, watchOS 5.2, tvOS 12.2, *)
     @_alwaysEmitIntoClient
     public var mutableSpan: MutableSpan<UInt8> {
-        @lifetime(&self)
+        @_lifetime(&self)
         mutating get {
 #if false // see https://github.com/swiftlang/swift/issues/81218
             var bytes = mutableBytes

Sources/FoundationEssentials/String/String+IO.swift

@@ -456,7 +456,8 @@ extension StringProtocol {
         let options : Data.WritingOptions = useAuxiliaryFile ? [.atomic] : []
 #endif
 
-        try writeToFile(path: .path(String(path)), buffer: data.bytes, options: options, attributes: attributes, reportProgress: false)
+        let bytes = data.bytes
+        try writeToFile(path: .path(String(path)), buffer: bytes, options: options, attributes: attributes, reportProgress: false)
     }
 
     /// Writes the contents of the `String` to the URL specified by url using the specified encoding.