Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Resolves conflicts #1

Merged
merged 10 commits into from
Dec 31, 2023
Merged

Resolves conflicts #1

merged 10 commits into from
Dec 31, 2023

Conversation

Matejkob
Copy link

No description provided.

arennow and others added 10 commits November 24, 2023 08:07
@arennow
Emit (any Error)? instead of Error?
c1cebe5
@Matejkob
Merge pull request #70 from arennow/existentialAnyError
dc896b6 
Emit `(any Error)?` instead of `Error?`
@Matejkob
Improve Closure Factory unit tests
21f7bf1
@Matejkob
Merge pull request #75 from /issues/2
9e7e8aa 
Improve Closure Factory unit tests
@Matejkob @github-actions
Run swift-format
0326d01
@Matejkob
Add handling inout parameter
a7a251e
@Matejkob
Update documentation
be4b509
@Matejkob
Merge pull request #76 from /issues/2
bb042da 
Add handling inout parameter
@Matejkob @github-actions
Run swift-format
4fc1535
@Matejkob
Merge branch 'main' into resolves-conflicts
a649109 
# Conflicts:
#	Sources/SpyableMacro/Factories/ClosureFactory.swift
#	Tests/SpyableMacroTests/Factories/UT_ClosureFactory.swift
@Matejkob
Copy link
Author

In this commit: a6491098317d4075201389d52c8e3b56efe45cf0 I've solved conflicts.

@Matejkob Matejkob mentioned this pull request Dec 30, 2023
Merged
dafurman
dafurman approved these changes Dec 30, 2023
View reviewed changes
Copy link
Owner

@dafurman dafurman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My changes look intact and tests pass - namely UT_FunctionImplementationFactory.testDeclarationWithEscapingAutoClosure() & UT_FunctionImplementationFactory.testDeclarationWithNonEscapingClosure()

Thanks for making this easier for me! 👍

@dafurman dafurman merged commit 25dac33 into dafurman:supportNonEscapingClosureParams Dec 31, 2023
@Matejkob Matejkob deleted the resolves-conflicts branch December 31, 2023 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dafurman dafurman dafurman approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Matejkob @dafurman @arennow