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

Next try at properly merging "Rewrite collectors #2240" #2278

Merged
merged 1 commit into from
Nov 10, 2022
Merged

Next try at properly merging "Rewrite collectors #2240" #2278

merged 1 commit into from
Nov 10, 2022

Conversation

kangalio
Copy link
Collaborator

@kangalio kangalio commented Nov 9, 2022 •
edited
Loading

#2240 had to be reverted because, in the process of rebasing, I accidentally reverted a few already-merged commits. I don't know exactly what went wrong so I just did the same thing again, carefully. I used the wrong PR base commit. I first used a01ee32, then cf38735, but the correct one was eee1c85

@github-actions github-actions bot added builder Related to the `builder` module. cache Related to the `cache`-feature. client Related to the `client` module. collector Related to the `collector` module. examples Related to Serenity's examples. gateway Related to the `gateway` module. http Related to the `http` module. model Related to the `model` module. labels Nov 9, 2022
@kangalio
Copy link
Collaborator Author

kangalio commented Nov 9, 2022 •
edited
Loading

Same issue as #2240. AcdenisSK explained the problem in the serenity support server in #lib-development. I still haven't found the correct base commit of the PR though. Need to continue this tomrorow Fixed the problem

@github-actions github-actions bot removed http Related to the `http` module. cache Related to the `cache`-feature. labels Nov 10, 2022
@kangalio
Copy link
Collaborator Author

CI failure is unrelated to this PR and fixed in #2279

@arqunis arqunis merged commit 623fb46 into serenity-rs:next Nov 10, 2022
@arqunis arqunis added enhancement An improvement to Serenity. breaking change The public API is changed, resulting in miscompilations or unexpected new behaviour for users labels Nov 10, 2022
arqunis pushed a commit that referenced this pull request Nov 13, 2022
@kangalio @arqunis
Rewrite collectors (#2278)
5e07c4a
mkrasnitski pushed a commit to mkrasnitski/serenity that referenced this pull request Feb 28, 2023
@kangalio @mkrasnitski
Rewrite collectors (serenity-rs#2278)
03abf59
mkrasnitski pushed a commit to mkrasnitski/serenity that referenced this pull request May 18, 2023
@kangalio @mkrasnitski
Rewrite collectors (serenity-rs#2278)
7d21dfd
mkrasnitski pushed a commit to mkrasnitski/serenity that referenced this pull request May 30, 2023
@kangalio @mkrasnitski
Rewrite collectors (serenity-rs#2278)
c3480b1
mkrasnitski pushed a commit to mkrasnitski/serenity that referenced this pull request Sep 21, 2023
@kangalio @mkrasnitski
Rewrite collectors (serenity-rs#2278)
721656d
mkrasnitski pushed a commit to mkrasnitski/serenity that referenced this pull request Oct 17, 2023
@kangalio @mkrasnitski
Rewrite collectors (serenity-rs#2278)
c0496e5
mkrasnitski pushed a commit to mkrasnitski/serenity that referenced this pull request Oct 24, 2023
@kangalio @mkrasnitski
Rewrite collectors (serenity-rs#2278)
e5eece2
arqunis pushed a commit to arqunis/serenity that referenced this pull request Oct 24, 2023
@kangalio @arqunis
Rewrite collectors (serenity-rs#2278)
8786760
arqunis pushed a commit to arqunis/serenity that referenced this pull request Oct 24, 2023
@kangalio @arqunis
Rewrite collectors (serenity-rs#2278)
fbd6540
@mkrasnitski mkrasnitski mentioned this pull request Apr 22, 2024
Merged
GnomedDev pushed a commit that referenced this pull request Apr 22, 2024
@mkrasnitski
Restore match arm for Error::Gateway variant (#2847)
39a0574 
This was mistakenly removed in #2278 and wasn't caught because of the
wildcard pattern in the match.
GnomedDev pushed a commit to GnomedDev/serenity that referenced this pull request May 14, 2024
@mkrasnitski @GnomedDev
Restore match arm for Error::Gateway variant (serenity-rs#2847)
8e2e803 
This was mistakenly removed in serenity-rs#2278 and wasn't caught because of the
wildcard pattern in the match.
GnomedDev pushed a commit that referenced this pull request May 14, 2024
@mkrasnitski @GnomedDev
Restore match arm for Error::Gateway variant (#2847)
dcef7f1 
This was mistakenly removed in #2278 and wasn't caught because of the
wildcard pattern in the match.
GnomedDev pushed a commit that referenced this pull request May 23, 2024
@mkrasnitski @GnomedDev
Restore match arm for Error::Gateway variant (#2847)
49abab7 
This was mistakenly removed in #2278 and wasn't caught because of the
wildcard pattern in the match.
GnomedDev pushed a commit that referenced this pull request May 28, 2024
@mkrasnitski @GnomedDev
Restore match arm for Error::Gateway variant (#2847)
13e3f9c 
This was mistakenly removed in #2278 and wasn't caught because of the
wildcard pattern in the match.
GnomedDev pushed a commit to GnomedDev/serenity that referenced this pull request Jun 9, 2024
@mkrasnitski @GnomedDev
Restore match arm for Error::Gateway variant (serenity-rs#2847)
b213438 
This was mistakenly removed in serenity-rs#2278 and wasn't caught because of the
wildcard pattern in the match.
GnomedDev pushed a commit that referenced this pull request Jun 22, 2024
@mkrasnitski @GnomedDev
Restore match arm for Error::Gateway variant (#2847)
37beb67 
This was mistakenly removed in #2278 and wasn't caught because of the
wildcard pattern in the match.
GnomedDev pushed a commit to GnomedDev/serenity that referenced this pull request Jun 22, 2024
@mkrasnitski @GnomedDev
Restore match arm for Error::Gateway variant (serenity-rs#2847)
a725fda 
This was mistakenly removed in serenity-rs#2278 and wasn't caught because of the
wildcard pattern in the match.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@arqunis arqunis arqunis approved these changes

Assignees
No one assigned
Labels
breaking change The public API is changed, resulting in miscompilations or unexpected new behaviour for users builder Related to the `builder` module. client Related to the `client` module. collector Related to the `collector` module. enhancement An improvement to Serenity. examples Related to Serenity's examples. gateway Related to the `gateway` module. model Related to the `model` module.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@kangalio @arqunis