mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
24ff368d4f
Addresses the following issues: rdar://problem/25992816 -[NSUserDefaults registerDefaults] is being imported as NSUserDefaults.register(), which is confusing rdar://problem/26291437 UserDefaults has 'setURL(forKey:)' instead of 'set(_:forKey:)' rdar://problem/26375229 FileManager overlay has old naming rdar://problem/26090891 NSBundle methods that are overridden in the apinotes incorrectly handle the first argument pattern rdar://problem/26271340 struct URL initializer for fileURLWithFileSystemRepresentation is incorrectly named' rdar://problem/26443640 XMLDTDNode.Kind conflicts with XMLNode.Kind and should be renamed to XMLDTDNode.DTDKind rdar://problem/26500390 registerUndoWithTarget in overlay not updated for new API names rdar://problem/26653451 NSCoder encodeDataObject is misleading rdar://problem/26653653 NSCoder decodeObjectOfClass is redundant rdar://problem/26653694 NSCoder.decodeTopLevelObjectForKey does not follow naming guidelines rdar://problem/26656299 SocketNativeHandle should be a hoisted type to SocketPort https://bugs.swift.org/browse/SR-1903
49 lines
2.2 KiB
Swift
49 lines
2.2 KiB
Swift
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This source file is part of the Swift.org open source project
|
|
//
|
|
// Copyright (c) 2014 - 2016 Apple Inc. and the Swift project authors
|
|
// Licensed under Apache License v2.0 with Runtime Library Exception
|
|
//
|
|
// See http://swift.org/LICENSE.txt for license information
|
|
// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
@_exported import Foundation // Clang module
|
|
|
|
@_silgen_name("NS_Swift_NSFileManager_replaceItemAtURL_withItemAtURL_backupItemName_options")
|
|
internal func NS_Swift_NSFileManager_replaceItemAtURL_withItemAtURL_backupItemName_options(
|
|
_ self_: AnyObject,
|
|
_ originalItemURL: AnyObject,
|
|
_ newItemURL: AnyObject,
|
|
_ backupItemName: String?,
|
|
_ options: FileManager.ItemReplacementOptions,
|
|
_ error: NSErrorPointer) -> NSURL?
|
|
|
|
|
|
extension FileManager {
|
|
/*
|
|
renamed syntax should be:
|
|
public func replaceItem(at originalItemURL: URL, withItemAt newItemURL: URL, backupItemName: String? = nil, options : FileManager.ItemReplacementOptions = []) throws -> URL?
|
|
*/
|
|
|
|
@available(*, deprecated, renamed:"replaceItemAt(_:withItemAt:backupItemName:options:)")
|
|
public func replaceItemAtURL(originalItemURL: NSURL, withItemAtURL newItemURL: NSURL, backupItemName: String? = nil, options: FileManager.ItemReplacementOptions = []) throws -> NSURL? {
|
|
var error: NSError? = nil
|
|
if let result = NS_Swift_NSFileManager_replaceItemAtURL_withItemAtURL_backupItemName_options(self, originalItemURL, newItemURL, backupItemName, options, &error) {
|
|
return result
|
|
}
|
|
throw error!
|
|
}
|
|
|
|
@available(OSX 10.6, iOS 4.0, *)
|
|
public func replaceItemAt(_ originalItemURL: URL, withItemAt newItemURL: URL, backupItemName: String? = nil, options: FileManager.ItemReplacementOptions = []) throws -> NSURL? {
|
|
var error: NSError? = nil
|
|
if let result = NS_Swift_NSFileManager_replaceItemAtURL_withItemAtURL_backupItemName_options(self, originalItemURL as URL, newItemURL as URL, backupItemName, options, &error) {
|
|
return result
|
|
}
|
|
throw error!
|
|
}
|
|
}
|