Merge branch 'main' into async-serve

vapor · May 13, 2024 · 8e39343 · 8e39343
2 parents 7ab7e5b + d9fa0d3
commit 8e39343
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Sources/Vapor/Application.swift b/Sources/Vapor/Application.swift
@@ -114,7 +114,7 @@ public final class Application: Sendable {
     private let _lifecycle: NIOLockedValueBox<Lifecycle>
     private let _locks: NIOLockedValueBox<Locks>
 
-    @available(*, noasync, message: "This initialiser cannot be used in async contexts, Application.makeApplication() instead")
+    @available(*, noasync, message: "This initialiser cannot be used in async contexts, use Application.make(_:_:) instead")
     public convenience init(
         _ environment: Environment = .development,
         _ eventLoopGroupProvider: EventLoopGroupProvider = .singleton

diff --git a/Sources/Vapor/Utilities/DirectoryConfiguration.swift b/Sources/Vapor/Utilities/DirectoryConfiguration.swift
@@ -1,5 +1,7 @@
-#if os(Linux)
+#if canImport(Glibc)
 import Glibc
+#elseif canImport(Musl)
+import Musl
 #else
 import Darwin.C
 #endif

diff --git a/Sources/Vapor/Utilities/DotEnv.swift b/Sources/Vapor/Utilities/DotEnv.swift
@@ -1,5 +1,7 @@
-#if os(Linux)
+#if canImport(Glibc)
 import Glibc
+#elseif canImport(Musl)
+import Musl
 #else
 import Darwin
 #endif