Skip to content

Update base tag for main to swift-DEVELOPMENT-SNAPSHOT-2024-09-24-a #440

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion schemes/main/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-09-18-a",
"base-tag": "swift-DEVELOPMENT-SNAPSHOT-2024-09-24-a",
"build-compiler": false,
"icu4c": [],
"libxml2": [
Expand Down
38 changes: 38 additions & 0 deletions schemes/main/swift-foundation/944.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From af1b3ddbb8c43c00a278619dfc8251f0f9554dc5 Mon Sep 17 00:00:00 2001
From: Yuta Saito <[email protected]>
Date: Wed, 25 Sep 2024 15:31:41 +0000
Subject: [PATCH] [wasm] Fix CocoaError construction for unsupported copy/link
operations

This is a follow-up fix for 6c0a3e8453cdde633e1c55f6112fd53a0d756979,
which re-organized CocoaError helper functions.
---
.../FoundationEssentials/FileManager/FileOperations.swift | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Sources/FoundationEssentials/FileManager/FileOperations.swift b/Sources/FoundationEssentials/FileManager/FileOperations.swift
index 1082e6b0..6f228d80 100644
--- a/Sources/FoundationEssentials/FileManager/FileOperations.swift
+++ b/Sources/FoundationEssentials/FileManager/FileOperations.swift
@@ -920,10 +920,11 @@ enum _FileOperations {
try delegate.throwIfNecessary(errno, src, dst)
return
}
+ let copyFile = delegate.copyData
guard !stat.isDirectory else {
// wasi-libc does not support FTS for now, so we don't support copying/linking
// directories on WASI for now.
- let error = CocoaError.fileOperationError(.featureUnsupported, src, dst)
+ let error = CocoaError.errorWithFilePath(.featureUnsupported, src, variant: copyFile ? "Copy" : "Link", source: src, destination: dst)
try delegate.throwIfNecessary(error, src, dst)
return
}
@@ -943,7 +944,7 @@ enum _FileOperations {
try delegate.throwIfNecessary(errno, src, dst)
}
} else {
- if delegate.copyData {
+ if copyFile {
try _copyRegularFile(srcPtr, dstPtr, delegate: delegate)
} else {
if link(srcPtr, dstPtr) != 0 {

This file was deleted.

This file was deleted.

Loading