[stdlib] all sorts of require renamed back to precondition

Author: Max Moiseev

benchmark/single-source/PopFrontGeneric.swift

@@ -23,11 +23,11 @@ func _arrayReplace<B: _ArrayBufferProtocol, C: Collection
   >(
   inout target: B, _ subRange: Range<Int>, _ newValues: C
 ) {
-  _require(
+  _precondition(
     subRange.startIndex >= 0,
     "Array replace: subRange start is negative")
 
-  _require(
+  _precondition(
     subRange.endIndex <= target.endIndex,
     "Array replace: subRange extends past the end")
 
@@ -40,7 +40,7 @@ func _arrayReplace<B: _ArrayBufferProtocol, C: Collection
     target.replace(subRange: subRange, with: insertCount, elementsOf: newValues)
   }
   else {
-    _requirementFailure("Should not get here?")
+    _preconditionFailure("Should not get here?")
   }
 }
 

stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb

@@ -866,7 +866,7 @@ public func runAllTests() {
 public class TestSuite {
   public init(_ name: String) {
     self.name = name
-    _require(
+    _precondition(
       _testNameToIndex[name] == nil,
       "test suite with the same name already exists")
     _allTestSuites.append(self)
@@ -890,12 +890,12 @@ public class TestSuite {
   }
 
   public func setUp(code: () -> Void) {
-    _require(_testSetUpCode == nil, "set-up code already set")
+    _precondition(_testSetUpCode == nil, "set-up code already set")
     _testSetUpCode = code
   }
 
   public func tearDown(code: () -> Void) {
-    _require(_testTearDownCode == nil, "tear-down code already set")
+    _precondition(_testTearDownCode == nil, "tear-down code already set")
     _testTearDownCode = code
   }
 

stdlib/private/StdlibUnittestFoundationExtras/StdlibUnittestFoundationExtras.swift

@@ -28,13 +28,13 @@ public func withOverriddenNSLocaleCurrentLocale<Result>(
 ) -> Result {
   let oldMethod = class_getClassMethod(
     NSLocale.self, #selector(NSLocale.current))
-  require(oldMethod != nil, "could not find +[NSLocale currentLocale]")
+  precondition(oldMethod != nil, "could not find +[NSLocale currentLocale]")
 
   let newMethod = class_getClassMethod(
     NSLocale.self, #selector(NSLocale._swiftUnittest_currentLocale))
-  require(newMethod != nil, "could not find +[NSLocale _swiftUnittest_currentLocale]")
+  precondition(newMethod != nil, "could not find +[NSLocale _swiftUnittest_currentLocale]")
 
-  require(_temporaryNSLocaleCurrentLocale == nil,
+  precondition(_temporaryNSLocaleCurrentLocale == nil,
     "nested calls to withOverriddenNSLocaleCurrentLocale are not supported")
 
   _temporaryNSLocaleCurrentLocale = temporaryLocale
@@ -50,7 +50,7 @@ public func withOverriddenNSLocaleCurrentLocale<Result>(
   temporaryLocaleIdentifier: String,
   @noescape _ body: () -> Result
 ) -> Result {
-  require(
+  precondition(
     NSLocale.availableLocaleIdentifiers().contains(temporaryLocaleIdentifier),
     "requested locale \(temporaryLocaleIdentifier) is not available")
 

stdlib/private/SwiftPrivateDarwinExtras/Subprocess.swift

@@ -54,7 +54,7 @@ func posixPipe() -> (readFD: CInt, writeFD: CInt) {
     (fds) in
     let ptr = fds.baseAddress
     if pipe(ptr) != 0 {
-      requirementFailure("pipe() failed")
+      preconditionFailure("pipe() failed")
     }
   }
   return (fds[0], fds[1])
@@ -66,46 +66,46 @@ public func spawnChild(args: [String])
   -> (pid: pid_t, stdinFD: CInt, stdoutFD: CInt, stderrFD: CInt) {
   var fileActions: posix_spawn_file_actions_t = nil
   if swift_posix_spawn_file_actions_init(&fileActions) != 0 {
-    requirementFailure("swift_posix_spawn_file_actions_init() failed")
+    preconditionFailure("swift_posix_spawn_file_actions_init() failed")
   }
 
   let childStdin = posixPipe()
   // Close the write end of the pipe on the child side.
   if swift_posix_spawn_file_actions_addclose(
     &fileActions, childStdin.writeFD) != 0 {
-    requirementFailure("swift_posix_spawn_file_actions_addclose() failed")
+    preconditionFailure("swift_posix_spawn_file_actions_addclose() failed")
   }
 
   // Remap child's stdin.
   if swift_posix_spawn_file_actions_adddup2(
     &fileActions, childStdin.readFD, STDIN_FILENO) != 0 {
-    requirementFailure("swift_posix_spawn_file_actions_adddup2() failed")
+    preconditionFailure("swift_posix_spawn_file_actions_adddup2() failed")
   }
 
   let childStdout = posixPipe()
   // Close the read end of the pipe on the child side.
   if swift_posix_spawn_file_actions_addclose(
     &fileActions, childStdout.readFD) != 0 {
-    requirementFailure("swift_posix_spawn_file_actions_addclose() failed")
+    preconditionFailure("swift_posix_spawn_file_actions_addclose() failed")
   }
 
   // Remap child's stdout.
   if swift_posix_spawn_file_actions_adddup2(
     &fileActions, childStdout.writeFD, STDOUT_FILENO) != 0 {
-    requirementFailure("swift_posix_spawn_file_actions_adddup2() failed")
+    preconditionFailure("swift_posix_spawn_file_actions_adddup2() failed")
   }
 
   let childStderr = posixPipe()
   // Close the read end of the pipe on the child side.
   if swift_posix_spawn_file_actions_addclose(
     &fileActions, childStderr.readFD) != 0 {
-    requirementFailure("swift_posix_spawn_file_actions_addclose() failed")
+    preconditionFailure("swift_posix_spawn_file_actions_addclose() failed")
   }
 
   // Remap child's stderr.
   if swift_posix_spawn_file_actions_adddup2(
     &fileActions, childStderr.writeFD, STDERR_FILENO) != 0 {
-    requirementFailure("swift_posix_spawn_file_actions_adddup2() failed")
+    preconditionFailure("swift_posix_spawn_file_actions_adddup2() failed")
   }
 
   var pid: pid_t = -1
@@ -115,26 +115,26 @@ public func spawnChild(args: [String])
   }
   if spawnResult != 0 {
     print(String(cString: strerror(spawnResult)))
-    requirementFailure("swift_posix_spawn() failed")
+    preconditionFailure("swift_posix_spawn() failed")
   }
 
   if swift_posix_spawn_file_actions_destroy(&fileActions) != 0 {
-    requirementFailure("swift_posix_spawn_file_actions_destroy() failed")
+    preconditionFailure("swift_posix_spawn_file_actions_destroy() failed")
   }
 
   // Close the read end of the pipe on the parent side.
   if close(childStdin.readFD) != 0 {
-    requirementFailure("close() failed")
+    preconditionFailure("close() failed")
   }
 
   // Close the write end of the pipe on the parent side.
   if close(childStdout.writeFD) != 0 {
-    requirementFailure("close() failed")
+    preconditionFailure("close() failed")
   }
 
   // Close the write end of the pipe on the parent side.
   if close(childStderr.writeFD) != 0 {
-    requirementFailure("close() failed")
+    preconditionFailure("close() failed")
   }
 
   return (pid, childStdin.writeFD, childStdout.readFD, childStderr.readFD)
@@ -156,7 +156,7 @@ internal func _readAll(fd: CInt) -> String {
     if readResult == 0 {
       break
     }
-    requirementFailure("read() failed")
+    preconditionFailure("read() failed")
   }
   return String._fromCodeUnitSequenceWithRepair(
     UTF8.self, input: buffer[0..<usedBytes]).0
@@ -193,15 +193,15 @@ public enum ProcessTerminationStatus : CustomStringConvertible {
 public func posixWaitpid(pid: pid_t) -> ProcessTerminationStatus {
   var status: CInt = 0
   if waitpid(pid, &status, 0) < 0 {
-    requirementFailure("waitpid() failed")
+    preconditionFailure("waitpid() failed")
   }
   if (WIFEXITED(status)) {
     return .Exit(Int(WEXITSTATUS(status)))
   }
   if (WIFSIGNALED(status)) {
     return .Signal(Int(WTERMSIG(status)))
   }
-  requirementFailure("did not understand what happened to child process")
+  preconditionFailure("did not understand what happened to child process")
 }
 
 public func runChild(args: [String])
@@ -215,10 +215,10 @@ public func runChild(args: [String])
   let stderr = _readAll(stderrFD)
 
   if close(stdoutFD) != 0 {
-    requirementFailure("close() failed")
+    preconditionFailure("close() failed")
   }
   if close(stderrFD) != 0 {
-    requirementFailure("close() failed")
+    preconditionFailure("close() failed")
   }
   let status = posixWaitpid(pid)
   return (stdout, stderr, status)

stdlib/public/SDK/CoreAudio/CoreAudio.swift

@@ -48,7 +48,7 @@ extension AudioBufferList {
   /// - Returns: the size in bytes of an `AudioBufferList` that can hold up to
   ///   `maximumBuffers` `AudioBuffer`s.
   public static func sizeInBytes(maximumBuffers maximumBuffers: Int) -> Int {
-    _require(maximumBuffers >= 1,
+    _precondition(maximumBuffers >= 1,
       "AudioBufferList should contain at least one AudioBuffer")
     return sizeof(AudioBufferList) +
       (maximumBuffers - 1) * strideof(AudioBuffer)
@@ -65,7 +65,7 @@ extension AudioBufferList {
     -> UnsafeMutableAudioBufferListPointer {
     let byteSize = sizeInBytes(maximumBuffers: maximumBuffers)
     let ablMemory = calloc(byteSize, 1)
-    _require(ablMemory != nil,
+    _precondition(ablMemory != nil,
       "failed to allocate memory for an AudioBufferList")
 
     let abl = UnsafeMutableAudioBufferListPointer(
@@ -134,12 +134,12 @@ extension UnsafeMutableAudioBufferListPointer : MutableCollection {
   /// Access an indexed `AudioBuffer` (`mBuffers[i]`).
   public subscript(index: Int) -> AudioBuffer {
     get {
-      _require(index >= 0 && index < self.count,
+      _precondition(index >= 0 && index < self.count,
         "subscript index out of range")
       return (_audioBuffersPointer + index).pointee
     }
     nonmutating set(newValue) {
-      _require(index >= 0 && index < self.count,
+      _precondition(index >= 0 && index < self.count,
         "subscript index out of range")
       (_audioBuffersPointer + index).pointee = newValue
     }

stdlib/public/SDK/Foundation/ExtraStringAPIs.swift

@@ -16,7 +16,7 @@
 extension String.UTF16View.Index : RandomAccessIndex {
   /// Construct from an integer offset.
   public init(_ offset: Int) {
-    _require(offset >= 0, "Negative UTF16 index offset not allowed")
+    _precondition(offset >= 0, "Negative UTF16 index offset not allowed")
     self.init(_offset: offset)
     // self._offset = offset
   }

stdlib/public/SDK/Foundation/Foundation.swift

@@ -482,7 +482,7 @@ extension Array : _ObjectiveCBridgeable {
     source: NSArray,
     inout result: Array?
   ) {
-    _require(
+    _precondition(
       Swift._isBridgedToObjectiveC(Element.self),
       "array element type is not bridged to Objective-C")
 

stdlib/public/SDK/Foundation/NSStringAPI.swift

@@ -947,7 +947,7 @@ extension String {
   /// format string as a template into which the remaining argument
   /// values are substituted according to given locale information.
   public init(format: String, locale: NSLocale?, arguments: [CVarArg]) {
-    _require(
+    _precondition(
       _countFormatSpecifiers(format) <= arguments.count,
       "Too many format specifiers (%<letter>) provided for the argument list"
     )

stdlib/public/SDK/GLKit/GLKit.swift.gyb

@@ -43,8 +43,8 @@ def defineSubscript(Type, limit):
   public subscript(i: Int) -> Float {{
     @inline(__always)
     get {{
-      _require(i >= 0, "Negative {0} index out of range")
-      _require(i < {1}, "{0} index out of range")
+      _precondition(i >= 0, "Negative {0} index out of range")
+      _precondition(i < {1}, "{0} index out of range")
 
       // We can't derive an UnsafePointer from a let binding. Lame.
       var clone = self

stdlib/public/SDK/XCTest/XCTest.swift

@@ -670,7 +670,7 @@ public func XCTAssertEqualWithAccuracy<T : FloatingPoint>(@autoclosure expressio
 
     default:
       // unknown type, fail with prejudice
-      _requirementFailure("unsupported floating-point type passed to XCTAssertEqualWithAccuracy")
+      _preconditionFailure("unsupported floating-point type passed to XCTAssertEqualWithAccuracy")
     }
 
     if !equalWithAccuracy {
@@ -741,7 +741,7 @@ public func XCTAssertNotEqualWithAccuracy<T : FloatingPoint>(@autoclosure expres
 
     default:
       // unknown type, fail with prejudice
-      _requirementFailure("unsupported floating-point type passed to XCTAssertNotEqualWithAccuracy")
+      _preconditionFailure("unsupported floating-point type passed to XCTAssertNotEqualWithAccuracy")
     }
 
     if !notEqualWithAccuracy {

stdlib/public/SDK/simd/simd.swift.gyb

@@ -100,7 +100,7 @@ public struct ${vectype} :
   ///
   /// - Precondition: `array` must have exactly ${cardinal[size]} elements.
   public init(_ array: [${type}]) {
-  _require(array.count == ${size},
+  _precondition(array.count == ${size},
                 "${vectype} requires a ${cardinal[size]}-element array")
     self.init(${', '.join(map(lambda i:
               'array[' + str(i) + ']',
@@ -116,16 +116,16 @@ public struct ${vectype} :
   public subscript(index: Int) -> ${type} {
     @_transparent
     get {
-      _require(index >= 0, "vector index out of range")
-      _require(index < ${size}, "vector index out of range")
+      _precondition(index >= 0, "vector index out of range")
+      _precondition(index < ${size}, "vector index out of range")
       let elt = Builtin.${extractelement}(_vector,
         Int32(index)._value)
       return ${type}(_bits: elt)
     }
     @_transparent
     set(value) {
-      _require(index >= 0, "vector index out of range")
-      _require(index < ${size}, "vector index out of range")
+      _precondition(index >= 0, "vector index out of range")
+      _precondition(index < ${size}, "vector index out of range")
       _vector = Builtin.${insertelement}(_vector,
         value._value,
         Int32(index)._value)
@@ -720,15 +720,15 @@ public struct ${mattype} : CustomDebugStringConvertible {
 
   /// Initialize matrix to have specified `columns`.
   public init(_ columns: [${coltype}]) {
-    _require(columns.count == ${cols}, "Requires array of ${cols} vectors")
+    _precondition(columns.count == ${cols}, "Requires array of ${cols} vectors")
 %   for i in range(cols):
     self._columns.${i} = columns[${i}]
 %   end
   }
 
   /// Initialize matrix to have specified `rows`.
   public init(rows: [${rowtype}]) {
-    _require(rows.count == ${rows}, "Requires array of ${rows} vectors")
+    _precondition(rows.count == ${rows}, "Requires array of ${rows} vectors")
 %   for i in range(cols):
       self._columns.${i} = [${', '.join(map(lambda j:
                             'rows[' + str(j) + '].' + component[i],
@@ -762,15 +762,15 @@ public struct ${mattype} : CustomDebugStringConvertible {
 % for i in range(cols):
       case ${i}: return _columns.${i}
 % end
-      default: _requirementFailure("Column index out of range")
+      default: _preconditionFailure("Column index out of range")
       }
     }
     set (value) {
       switch(column) {
 % for i in range(cols):
       case ${i}: _columns.${i} = value
 % end
-      default: _requirementFailure("Column index out of range")
+      default: _preconditionFailure("Column index out of range")
       }
     }
   }