Skip to content

Move from golang.org/x/exp/slices into slices#13403

Merged
beorn7 merged 1 commit intoprometheus:mainfrom
machine424:slices
Feb 28, 2024
Merged

Move from golang.org/x/exp/slices into slices#13403
beorn7 merged 1 commit intoprometheus:mainfrom
machine424:slices

Conversation

@machine424
Copy link
Copy Markdown
Member

@machine424 machine424 commented Jan 15, 2024

Prevent adding back golang.org/x/exp/slices.

"slices" was introduced in golang 1.21

Only merge once Prometheus only supports >= go1.21

@arukiidou
Copy link
Copy Markdown
Contributor

@machine424 Could you rebase this?
Maybe it will pass the test.

@machine424 machine424 changed the title Requires Go >=1.21: Move from golang.org/x/exp/slices into slices Move from golang.org/x/exp/slices into slices Feb 27, 2024
@machine424
Copy link
Copy Markdown
Member Author

rebased.
Should be ready to review/merge now.

@machine424 machine424 force-pushed the slices branch 2 times, most recently from 7a5cfe2 to 4658682 Compare February 27, 2024 11:56
@beorn7
Copy link
Copy Markdown
Member

beorn7 commented Feb 28, 2024

It has merge conflicts again, but only in go.mod. Could you address them once more? I'll try to merge quickly after that.

…t Go >= 1.21

Prevent adding back golang.org/x/exp/slices.

Signed-off-by: machine424 <ayoubmrini424@gmail.com>
@machine424
Copy link
Copy Markdown
Member Author

done

@beorn7 beorn7 merged commit 0824e6e into prometheus:main Feb 28, 2024
@beorn7
Copy link
Copy Markdown
Member

beorn7 commented Feb 28, 2024

thank you

duricanikolic added a commit to grafana/mimir-prometheus that referenced this pull request Mar 6, 2024
This completes prometheus/prometheus#13403

Signed-off-by: Yuri Nikolic <durica.nikolic@grafana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants