refactor: use slices.Contains to simplify code #12877
Merged
Conversation
This file contains hidden or 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
Contributor
|
you could go one step further and remove the StringContains function, replacing with this newer func from stdlib |
Contributor
Author
Good idea. Modified. Please review again. |
glours
approved these changes
May 27, 2025
Contributor
Author
Sorry, it looks like I missed one place. |
Signed-off-by: tongjicoder <[email protected]>
ndeloof
approved these changes
May 27, 2025
Contributor
Author
|
It seems that the new IDE I switched to doesn't automatically save changes, which caused the issue. I've made the modifications now. Please approve the CI again. |
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Jun 12, 2025
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/compose](https://github.com/docker/compose) | minor | `v2.36.2` -> `v2.37.1` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>docker/compose (docker/compose)</summary> ### [`v2.37.1`](https://github.com/docker/compose/releases/tag/v2.37.1) [Compare Source](docker/compose@v2.37.0...v2.37.1) #### What's Changed ##### ✨ Improvements - Add support for extra_hosts building with bake by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12935 ##### 🐛 Fixes - Fix SIGSEGV on Enable Watch by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12909 - Revert docker compose images JSON output to array format by [@​x0rw](https://github.com/x0rw) in docker/compose#12917 - Sanitize service name so they can be used as bake targets by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12925 - Only look for required image in bake metadata by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12930 - Don't create metadatafile, just generate a random name by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12931 - Fix the generated manifest for compose artifacts by [@​jcarter3](https://github.com/jcarter3) in docker/compose#12933 - Fix support for additional_contexts with service sub-dependencies by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12936 - Fix panic on failure starting plugin server by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12914 ##### 🔧 Internal - Do not forget to remove the bake metadata file by [@​glours](https://github.com/glours) in docker/compose#12912 ##### ⚙️ Dependencies - Bump golang.org/x/sync v0.15.0 by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12913 - Build(deps): bump google.golang.org/grpc from 1.72.2 to 1.73.0 by [@​dependabot](https://github.com/dependabot) in docker/compose#12910 #### New Contributors - [@​x0rw](https://github.com/x0rw) made their first contribution in docker/compose#12917 - [@​jcarter3](https://github.com/jcarter3) made their first contribution in docker/compose#12933 **Full Changelog**: docker/compose@v2.37.0...v2.37.1 ### [`v2.37.0`](https://github.com/docker/compose/releases/tag/v2.37.0) [Compare Source](docker/compose@v2.36.2...v2.37.0) #### What's Changed ℹ️ `bake` is now used as the default images builder, if you don't want to use it you could opt-out by setting the `COMPOSE_BAKE` env variable to `false` ##### ✨ Improvements - Add compose bridge by [@​glours](https://github.com/glours) in docker/compose#12866 - Include platform and creation date listing image by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12856 - Add support of metadata subcommand for provider services by [@​glours](https://github.com/glours) in docker/compose#12903 - Use bake by default by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12699 ##### 🐛 Fixes - (Re)start dependent services after watch rebuilt image by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12879 - Resolve symlinks while making dockerfile path absolute by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12884 - Fix support for `BUILDKIT_PROGRESS` by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12894 - Build dependent service images when required by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12896 - Fix recreate network (and connected containers) on config updates by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12899 - `pull` does not require `env_file` being resolved by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12904 ##### 🔧 Internal - Refactor: use slices.Contains to simplify code by [@​tongjicoder](https://github.com/tongjicoder) in docker/compose#12877 - Remove utils.Contains to prefer slice.ContainsFunc by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12878 - Fix typo in suggestion log by [@​Carlos-err406](https://github.com/Carlos-err406) in docker/compose#12893 - Replace uses of golang.org/x/exp/(maps|slices) for stdlib and fix linting by [@​thaJeztah](https://github.com/thaJeztah) in docker/compose#12885 - Debug message to help diagnose platform mismatch by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12905 - (refactoting) Move watch logic into a dedicated Watcher type by [@​ndeloof](https://github.com/ndeloof) in docker/compose#12865 ##### ⚙️ Dependencies - Bump cli-doc-tools to v0.10.0 by [@​glours](https://github.com/glours) in docker/compose#12855 - Bump github.com/docker/docker, docker/cli v28.2.2 by [@​thaJeztah](https://github.com/thaJeztah) in docker/compose#12875 - Build(deps): bump google.golang.org/grpc from 1.72.1 to 1.72.2 by [@​dependabot](https://github.com/dependabot) in docker/compose#12872 #### New Contributors - [@​tongjicoder](https://github.com/tongjicoder) made their first contribution in docker/compose#12877 - [@​Carlos-err406](https://github.com/Carlos-err406) made their first contribution in docker/compose#12893 **Full Changelog**: docker/compose@v2.36.2...v2.37.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MC41MC4wIiwidXBkYXRlZEluVmVyIjoiNDAuNTAuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90Il19-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
What I did
There is a new function added in the go1.21 standard library, which can make the code more concise and easy to read.
Related issue
(not mandatory) A picture of a cute animal, if possible in relation to what you did