Skip to content

Commit

Permalink
Merge branch 'master' into add-error-channel-handler-841
Browse files Browse the repository at this point in the history
  • Loading branch information
Lukasa authored Apr 29, 2019
2 parents 34c82c7 + 902cf2e commit 2b2d67c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
11 changes: 1 addition & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,6 @@ Applications that need extremely high performance from their networking stack ma

The core SwiftNIO repository will contain a few extremely important protocol implementations, such as HTTP, directly in tree. However, we believe that most protocol implementations should be decoupled from the release cycle of the underlying networking stack, as the release cadence is likely to be very different (either much faster or much slower). For this reason, we actively encourage the community to develop and maintain their protocol implementations out-of-tree. Indeed, some first-party SwiftNIO protocol implementations, including our TLS and HTTP/2 bindings, are developed out-of-tree!

## Useful Protocol Implementations

The following projects contain useful protocol implementations that do not live in-tree in SwiftNIO:

- bindings to OpenSSL-compatible libraries for TLS: [swift-nio-ssl](https://github.com/apple/swift-nio-ssl)
- HTTP/2 support for SwiftNIO: [swift-nio-http2](https://github.com/apple/swift-nio-http2)
- Network.framework support for SwiftNIO on iOS, tvOS and macOS: [swift-nio-transport-services](https://github.com/apple/swift-nio-transport-services)
- useful code around SwiftNIO: [swift-nio-extras](https://github.com/apple/swift-nio-extras)

## Documentation

- [API documentation](https://apple.github.io/swift-nio/docs/current/NIO/index.html)
Expand Down Expand Up @@ -254,7 +245,7 @@ have a few prerequisites installed on your system.

### Linux

- Swift 5.0 from [swift.org/download](https://swift.org/download/#swift-50-development).
- Swift 5.0 from [swift.org/download](https://swift.org/download/#releases).
- netcat (for integration tests only)
- lsof (for integration tests only)
- shasum (for integration tests only)
Expand Down
3 changes: 1 addition & 2 deletions Sources/NIO/CircularBuffer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,8 @@ public struct CircularBuffer<Element>: CustomStringConvertible {
// if we can, we store the check for the backing here
self._backingCheck = backingCount < Int(_UInt24.max) ? _UInt24(UInt32(backingCount)) : .max
}
assert(MemoryLayout.size(ofValue: self) == MemoryLayout<Int>.size)
}

@inlinable
public static func < (lhs: Index, rhs: Index) -> Bool {
if lhs.isIndexGEQHeadIndex && rhs.isIndexGEQHeadIndex {
Expand Down

0 comments on commit 2b2d67c

Please sign in to comment.