Skip to content

Commit 466f902

Browse files
committed
Merge branch 'develop' into main
2 parents 4f92ea3 + e04356b commit 466f902

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

Sources/MacroApp/App.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ public protocol App: Endpoints, MiddlewareObject {
5050
*/
5151
var port : Int? { get }
5252

53+
/**
54+
* Init is required to support `@main` (i.e. `static func main()`).
55+
*/
5356
init()
5457
}
5558

Sources/MacroApp/Endpoints/MethodEndpoints.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,49 +15,49 @@ import protocol MacroExpress.RouteKeeper
1515
// Crazy, isn't it? :-)
1616

1717
public func All(id: String? = nil, _ pathPattern: String? = nil,
18-
middleware: Middleware...) -> Use
18+
_ middleware: Middleware...) -> Use
1919
{
2020
return Use(id: id, pathPattern: pathPattern, method: nil,
2121
middleware: middleware, errorMiddleware: [])
2222
}
2323

2424
public func Get(id: String? = nil, _ pathPattern: String? = nil,
25-
middleware: Middleware...) -> Use
25+
_ middleware: Middleware...) -> Use
2626
{
2727
return Use(id: id, pathPattern: pathPattern, method: .GET,
2828
middleware: middleware, errorMiddleware: [])
2929
}
3030

3131
public func Head(id: String? = nil, _ pathPattern: String? = nil,
32-
middleware: Middleware...) -> Use
32+
_ middleware: Middleware...) -> Use
3333
{
3434
return Use(id: id, pathPattern: pathPattern, method: .HEAD,
3535
middleware: middleware, errorMiddleware: [])
3636
}
3737

3838
public func Put(id: String? = nil, _ pathPattern: String? = nil,
39-
middleware: Middleware...) -> Use
39+
_ middleware: Middleware...) -> Use
4040
{
4141
return Use(id: id, pathPattern: pathPattern, method: .PUT,
4242
middleware: middleware, errorMiddleware: [])
4343
}
4444

4545
public func Patch(id: String? = nil, _ pathPattern: String? = nil,
46-
middleware: Middleware...) -> Use
46+
_ middleware: Middleware...) -> Use
4747
{
4848
return Use(id: id, pathPattern: pathPattern, method: .PATCH,
4949
middleware: middleware, errorMiddleware: [])
5050
}
5151

5252
public func Delete(id: String? = nil, _ pathPattern: String? = nil,
53-
middleware: Middleware...) -> Use
53+
_ middleware: Middleware...) -> Use
5454
{
5555
return Use(id: id, pathPattern: pathPattern, method: .DELETE,
5656
middleware: middleware, errorMiddleware: [])
5757
}
5858

5959
public func Post(id: String? = nil, _ pathPattern: String? = nil,
60-
middleware: Middleware...) -> Use
60+
_ middleware: Middleware...) -> Use
6161
{
6262
return Use(id: id, pathPattern: pathPattern, method: .POST,
6363
middleware: middleware, errorMiddleware: [])

0 commit comments

Comments
 (0)