Skip to content

use BTreeSet for ruleset rules#2319

Merged
marcoieni merged 1 commit intomainfrom
use-btreeset-for-ruleset-rules
Mar 13, 2026
Merged

use BTreeSet for ruleset rules#2319
marcoieni merged 1 commit intomainfrom
use-btreeset-for-ruleset-rules

Conversation

@marcoieni
Copy link
Member

@marcoieni marcoieni commented Mar 13, 2026

This PR fixes the empty sync-team diff we see in PRs

@marcoieni marcoieni force-pushed the use-btreeset-for-ruleset-rules branch 4 times, most recently from 843fdc3 to bf055c3 Compare March 13, 2026 12:31
@github-actions
Copy link

Dry-run check results

[WARN  rust_team::sync] sync-team is running in dry mode, no changes will be applied.
[INFO  rust_team::sync] synchronizing crates-io
[INFO  rust_team::sync] synchronizing github

@marcoieni marcoieni marked this pull request as ready for review March 13, 2026 12:44
@marcoieni marcoieni force-pushed the use-btreeset-for-ruleset-rules branch from bf055c3 to acc2944 Compare March 13, 2026 12:46
Copy link
Member

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

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

I was thinking about this when examining the implementation; I hoped that GitHub keeps the order. Seems not, so keeping it sorted it is.

Even better would be to actually represent the rules as fields, rather than in a container, because we use at most one rule per type anyway. But that's a more complex change.

@marcoieni marcoieni added this pull request to the merge queue Mar 13, 2026
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 13, 2026
@marcoieni
Copy link
Member Author

It failed with the following error:

    📝 Editing repo 'rust-lang/bors':
      Rulesets:
          Updating 'Ruleset for main'
            Bypass Actors: Some([]) => None
    📝 Editing repo 'rust-lang/thorin':
      Branch Protections:
          main
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 1
            Requires PR: true
            Required Checks: []
            Allowances: []
    📝 Editing repo 'rust-lang/triagebot':
      Branch Protections:
          master
            Dismiss Stale Reviews: false
            Is admin enforced: true
            Required Approving Review Count: 1
            Requires PR: true
            Required Checks: ["ci"]
            Allowances: []
    
Error: rust_team] failed: graphql error: Name already protected: main

@marcoieni
Copy link
Member Author

I'll try again to merge this. Maybe some flakiness from github..

@marcoieni marcoieni added this pull request to the merge queue Mar 13, 2026
Merged via the queue into main with commit b25e5a3 Mar 13, 2026
3 checks passed
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