Skip to content

Commit b80d320

Browse files
committed
filetransfer: mark enqueueFileTransfer() as noexcept
1 parent 2ba1402 commit b80d320

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/libstore/filetransfer.cc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -965,7 +965,8 @@ struct curlFileTransfer : public FileTransfer
965965
return ItemHandle(static_cast<Item &>(*item));
966966
}
967967

968-
ItemHandle enqueueFileTransfer(const FileTransferRequest & request, Callback<FileTransferResult> callback) override
968+
ItemHandle
969+
enqueueFileTransfer(const FileTransferRequest & request, Callback<FileTransferResult> callback) noexcept override
969970
{
970971
/* Handle s3:// URIs by converting to HTTPS and optionally adding auth */
971972
if (request.uri.scheme() == "s3") {
@@ -1047,7 +1048,7 @@ void FileTransferRequest::setupForS3()
10471048
#endif
10481049
}
10491050

1050-
std::future<FileTransferResult> FileTransfer::enqueueFileTransfer(const FileTransferRequest & request)
1051+
std::future<FileTransferResult> FileTransfer::enqueueFileTransfer(const FileTransferRequest & request) noexcept
10511052
{
10521053
auto promise = std::make_shared<std::promise<FileTransferResult>>();
10531054
enqueueFileTransfer(request, {[promise](std::future<FileTransferResult> fut) {

src/libstore/include/nix/store/filetransfer.hh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,14 +279,14 @@ public:
279279
* exception.
280280
*/
281281
virtual ItemHandle
282-
enqueueFileTransfer(const FileTransferRequest & request, Callback<FileTransferResult> callback) = 0;
282+
enqueueFileTransfer(const FileTransferRequest & request, Callback<FileTransferResult> callback) noexcept = 0;
283283

284284
/**
285285
* Unpause a transfer that has been previously paused by a dataCallback.
286286
*/
287287
virtual void unpauseTransfer(ItemHandle handle) = 0;
288288

289-
std::future<FileTransferResult> enqueueFileTransfer(const FileTransferRequest & request);
289+
std::future<FileTransferResult> enqueueFileTransfer(const FileTransferRequest & request) noexcept;
290290

291291
/**
292292
* Synchronously download a file.

0 commit comments

Comments
 (0)