Use #fileID/#filePath instead of #file #2306
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Motivation: Modifications: Changed #file to #filePath or #fileID depending on the situation
glbrntt
requested changes
Nov 3, 2022
| @@ -0,0 +1,218 @@ | |||
| //===----------------------------------------------------------------------===// | |||
There was a problem hiding this comment.
This file shouldn't exist anymore, it was removed in #2292
Sources/NIOCore/EventLoop.swift
Outdated
| @@ -786,7 +786,7 @@ extension EventLoop { | |||
| line: UInt, | |||
| _ task: @escaping FlatScheduleTaskDelayCallback<T> | |||
| ) -> Scheduled<T> { | |||
| let promise: EventLoopPromise<T> = self.makePromise(file:#file, line: line) | |||
| let promise: EventLoopPromise<T> = self.makePromise(file:#fileID, line: line) | |||
There was a problem hiding this comment.
Looks like there was a bug here, it should just be the file passed into the func
Suggested change
| let promise: EventLoopPromise<T> = self.makePromise(file:#fileID, line: line) | |
| let promise: EventLoopPromise<T> = self.makePromise(file: file, line: line) |
Comment on lines
510
to
515
| <<<<<<< Updated upstream | ||
| fileprivate func XCTAsyncAssertTrue(_ predicate: @autoclosure () async throws -> Bool, file: StaticString = #file, line: UInt = #line) async rethrows { | ||
| ======= | ||
| #if compiler(>=5.5.2) && canImport(_Concurrency) | ||
| fileprivate func XCTAsyncAssertTrue(_ predicate: @autoclosure () async throws -> Bool, file: StaticString = #filePath, line: UInt = #line) async rethrows { | ||
| >>>>>>> Stashed changes |
There was a problem hiding this comment.
Oops, bad merge, I think you want:
Suggested change
| <<<<<<< Updated upstream | |
| fileprivate func XCTAsyncAssertTrue(_ predicate: @autoclosure () async throws -> Bool, file: StaticString = #file, line: UInt = #line) async rethrows { | |
| ======= | |
| #if compiler(>=5.5.2) && canImport(_Concurrency) | |
| fileprivate func XCTAsyncAssertTrue(_ predicate: @autoclosure () async throws -> Bool, file: StaticString = #filePath, line: UInt = #line) async rethrows { | |
| >>>>>>> Stashed changes | |
| fileprivate func XCTAsyncAssertTrue(_ predicate: @autoclosure () async throws -> Bool, file: StaticString = #filePath, line: UInt = #line) async rethrows { |
Comment on lines
30
to
35
| <<<<<<< Updated upstream | ||
| ("testHTTPResponseStatusFromStatusCode", testHTTPResponseStatusFromStatusCode), | ||
| ("testHTTPResponseStatusCodeAndReason", testHTTPResponseStatusCodeAndReason), | ||
| ======= | ||
| ("testHTTPResponseStatusFromStatusCode", testHTTPResponseStatusFromStatusCode), | ||
| >>>>>>> Stashed changes |
There was a problem hiding this comment.
Bad merge again. The best way to fix this one is to run ./scripts/generate_linux_tests.rb
There was a problem hiding this comment.
How would I know when I need to run this in the future?
There was a problem hiding this comment.
Every time you add tests. Also one of the CI jobs ("pull request validation (soundness)") will fail if it needs to be run and hasn't been.
glbrntt
added
the
patch-version-bump-only
glbrntt
approved these changes
Nov 3, 2022
|
Nightly CI failure is unrelated. Merging over it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation:
#fileID introduced in Swift 5.3, so no longer need to use #file anywhere
Modifications:
Changed #file to #filePath or #fileID depending on the situation