chore: Use slices package where possible #6585
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
|
2nd commit is potentially more controversial, using |
mohammed90
approved these changes
Sep 21, 2024
|
Added even more. FWIW, I was using regexp searches like this to find them 😂 might've missed some, did the ones I could find. |
francislavoie
force-pushed
the
slices-pkg
branch
2 times, most recently
from
9151be6
to
610980c
Compare
francislavoie
force-pushed
the
slices-pkg
branch
from
610980c
to
794423b
Compare
I was going to suggest semgrep, but apparently they went all proprietary 😕 |
mholt
approved these changes
Sep 25, 2024
| @@ -110,17 +111,12 @@ func parseOptOrder(d *caddyfile.Dispenser, _ any) (any, error) { | |||
| } | |||
| pos := Positional(d.Val()) | |||
|
|
|||
| newOrder := directiveOrder | |||
| // if directive already had an order, drop it | |||
| newOrder := slices.DeleteFunc(directiveOrder, func(d string) bool { | |||
Comment on lines
+292
to
+294
| optsIndex := slices.IndexFunc(serverOpts, func(s serverOptions) bool { | ||
| return s.ListenerAddress == "" || slices.Contains(server.Listen, s.ListenerAddress) | ||
| }) |
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.
Just a simple cleanup, we can use
slices.Contains()in a bunch of spots now instead of helper functions to do the simple loop.