Merge pull request #70 from nodes-vapor/feature/fix-swift-5-warnings

Remove redundant access modifiers
ml-archive · May 7, 2019 · aa01552 · aa01552
2 parents e09e2af + 48a180d
commit aa01552
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 deletions.
diff --git a/Sources/Paginator/Paginatable/ArrayPaginatable.swift b/Sources/Paginator/Paginatable/ArrayPaginatable.swift
@@ -20,7 +20,7 @@ public extension ArrayPaginatable {
 }
 
 public extension Array where Iterator.Element: Codable {
-    public func paginate<P: Paginator>(
+    func paginate<P: Paginator>(
         for req: Request
     ) throws -> Future<P> where
         P: ArrayPaginatable,
@@ -31,7 +31,7 @@ public extension Array where Iterator.Element: Codable {
         return try self.paginate(count: self.count, for: req)
     }
 
-    public func paginate<P: Paginator>(
+    func paginate<P: Paginator>(
         count: Int,
         for req: Request
     ) throws -> Future<P> where
@@ -53,7 +53,7 @@ extension Array: Transformable where Iterator.Element: Codable {
 }
 
 public extension TransformingQuery {
-    public func paginate<P: Paginator>(
+    func paginate<P: Paginator>(
         for req: Request
     ) throws -> Future<P> where
         P: ArrayPaginatable,
@@ -64,7 +64,7 @@ public extension TransformingQuery {
         return try self.paginate(count: self.source.count, for: req)
     }
 
-    public func paginate<P: Paginator>(
+    func paginate<P: Paginator>(
         count: Int,
         for req: Request
     ) throws -> Future<P> where

diff --git a/Sources/Paginator/Paginatable/QueryBuilderPaginatable.swift b/Sources/Paginator/Paginatable/QueryBuilderPaginatable.swift
@@ -12,7 +12,7 @@ public protocol QueryBuilderPaginatable: Paginatable {
 }
 
 public extension QueryBuilder {
-    public func paginate<P: Paginator>(
+    func paginate<P: Paginator>(
         for req: Request
     ) throws -> Future<P> where
         P: QueryBuilderPaginatable,
@@ -22,7 +22,7 @@ public extension QueryBuilder {
         return try paginate(count: count(), for: req)
     }
 
-    public func paginate<P: Paginator>(
+    func paginate<P: Paginator>(
         count: Future<Int>,
         for req: Request
     ) throws -> Future<P> where
@@ -40,7 +40,7 @@ extension QueryBuilder: Transformable {
 }
 
 public extension TransformingQuery {
-    public func paginate<P: Paginator, T>(
+    func paginate<P: Paginator, T>(
         for req: Request
     ) throws -> Future<P> where
         T: QuerySupporting,
@@ -52,7 +52,7 @@ public extension TransformingQuery {
         return try self.paginate(count: self.source.count(), for: req)
     }
 
-    public func paginate<P: Paginator, T>(
+    func paginate<P: Paginator, T>(
         count: Future<Int>,
         for req: Request
     ) throws -> Future<P> where

diff --git a/Sources/Paginator/Paginators/OffsetPaginator/OffsetPaginator.swift b/Sources/Paginator/Paginators/OffsetPaginator/OffsetPaginator.swift
@@ -24,8 +24,8 @@ public struct OffsetPaginator<Object: Codable>: Paginator {
 }
 
 public extension OffsetPaginator {
-    public typealias ResultObject = Object
-    public typealias PaginatableMetaData = OffsetMetaData
+    typealias ResultObject = Object
+    typealias PaginatableMetaData = OffsetMetaData
 }
 
 public struct OffsetMetaData: Codable {

diff --git a/Sources/Paginator/Paginators/OffsetPaginator/OffsetPaginatorLinks.swift b/Sources/Paginator/Paginators/OffsetPaginator/OffsetPaginatorLinks.swift
@@ -1,7 +1,7 @@
 import Vapor
 
 public extension OffsetMetaData {
-    public static func nextAndPreviousLinks(
+    static func nextAndPreviousLinks(
         currentPage: Int,
         totalPages: Int,
         url: URL
@@ -21,13 +21,13 @@ public extension OffsetMetaData {
         return (previous, next)
     }
 
-    public func links(
+    func links(
         in range: CountableClosedRange<Int>
     ) throws -> [String] {
         return try range.map { try link(for: $0) }
     }
 
-    public func link(
+    func link(
         for page: Int
     ) throws -> String {
         return try OffsetMetaData.link(url: self.url, page: page)

diff --git a/Sources/Paginator/Tags/OffsetPaginatorControlData.swift b/Sources/Paginator/Tags/OffsetPaginatorControlData.swift
@@ -95,7 +95,7 @@ public enum TagContextPaginatorError: Error {
 }
 
 public extension OffsetPaginator {
-    public func userInfo() throws -> [AnyHashable: Any] {
+    func userInfo() throws -> [AnyHashable: Any] {
         guard let metaData = self.metaData() else {
             throw TagContextPaginatorError.paginatorDoesNotContainMetaData
         }
@@ -105,7 +105,7 @@ public extension OffsetPaginator {
 }
 
 public extension TagContext {
-    public func requireOffsetPaginatorControlData() throws -> OffsetPaginatorControlData {
+    func requireOffsetPaginatorControlData() throws -> OffsetPaginatorControlData {
         guard
             let metaData = self.context.userInfo[userInfoKey] as? OffsetPaginatorControlData
         else {

diff --git a/Sources/Paginator/Transform.swift b/Sources/Paginator/Transform.swift
@@ -26,7 +26,7 @@ public protocol Transformable {
 }
 
 public extension Transformable {
-    public func transform<T: Codable>(
+    func transform<T: Codable>(
         on req: Request,
         _ transform: @escaping (TransformableQueryResult) throws -> T
     ) throws -> TransformingQuery<TransformableQuery, TransformableQueryResult, T> {
@@ -37,7 +37,7 @@ public extension Transformable {
         return try self.transform(on: req, newTransform)
     }
 
-    public func transform<T: Codable>(
+    func transform<T: Codable>(
         on req: Request,
         _ transform: @escaping (TransformableQueryResult) throws -> Future<T>
     ) -> TransformingQuery<Self, Self.TransformableQueryResult, T> {
@@ -48,7 +48,7 @@ public extension Transformable {
         return TransformingQuery(source: self, transform: newTransform)
     }
 
-    public func transform<T: Codable>(
+    func transform<T: Codable>(
         on req: Request,
         _ transform: @escaping ([TransformableQueryResult]) throws -> Future<[T]>
     ) -> TransformingQuery<Self, Self.TransformableQueryResult, T> {