Added CLI command to automate team and repo archival by Sandijigs · Pull Request #2420 · rust-lang/team

Sandijigs · 2026-04-15T20:44:06Z

This PR adds a new archive subcommand to the CLI that handles moving TOML files to the archive/ directory, clearing team access on repos, and moving team members to alumni .
Example usage:

cargo run -- archive repo rust-lang/homu
cargo run -- archive team project-generic-associated-types

For repos, it moves the file to repos/archive/{org}/ and clears all entries under [access.teams].
For teams, it moves the file to teams/archive/, sets leads and members to empty, and moves everyone into alumni.

I used toml_edit to modify the TOML files so that only the parts that need to change are touched everything else (comments, formatting, ordering) stays the same.

Closes #1547

github-actions · 2026-04-15T21:15:06Z

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 · 2026-04-15T21:21:37Z

I tested archiving a team, but alumni are in one line. Can we put one member per line?

Sandijigs · 2026-04-15T21:45:48Z

The alumni are now listed one per line.

marcoieni · 2026-04-15T21:52:05Z

One thing I noticed: when archiving a team, you should remove the team access from other repos, like it was done in #2214
Probably this is more complicated, so no need to do this if you don't have time.

EDIT: actually you already have the logic to remove teams from a repo so maybe it's not that difficult!

Sandijigs · 2026-04-16T21:01:53Z

I added a remove_team_from_repos function that runs after the team file is archived. It scans all repo TOML files and removes the archived team's entry from any [access.teams] block where it appears.

marcoieni · 2026-04-16T21:41:16Z

 tempfile = "3.19.1"
 thiserror = "2.0.18"
 toml = "1.0"
+toml_edit = "0.22"


Why not using the latest version of this package? I.e. what cargo add adds.

marcoieni · 2026-04-16T21:42:52Z

+    remove_team_from_repos(data_dir, name)?;
+
+    Ok(())
+}


this function is very long. I would extract it into smaller ones.

marcoieni · 2026-04-16T21:44:34Z

+    std::fs::create_dir_all(&dest_dir)
+        .with_context(|| format!("failed to create directory {}", dest_dir.display()))?;
+    std::fs::write(&dest, doc.to_string())
+        .with_context(|| format!("failed to write {}", dest.display()))?;
+    std::fs::remove_file(&src).with_context(|| format!("failed to remove {}", src.display()))?;


this code is duplicated among the two functions. So it would be nice to extract it into a function and reuse it.

In general, please inspect your code and find opportunities similar to this one to extract common code.

marcoieni · 2026-04-16T21:45:38Z

+    if let Some(access) = doc.get_mut("access")
+        && let Some(teams) = access.get_mut("teams")
+        && let Some(table) = teams.as_table_mut()
+    {
+        table.clear();
+    }


this code is also duplicated with the other function. It would be nice to extract it

Sandijigs · 2026-04-17T12:46:34Z

Thanks for pointing that out. I have extracted the [access.teams] navigation into a shared get_access_teams helper and updated both archive_repo and remove_team_from_repos to use it.

ubiratansoares

@Sandijigs Added some comments

ubiratansoares · 2026-04-17T18:24:15Z

+        let mut all_alumni: Vec<String> = Vec::new();
+        let mut seen = HashSet::new();


Could we use only the hashset here?

Thanks for pointing this out , Should I switch IndexSet from indexmap? since it handles both deduplication and preserves insertion order in a single data structure. which was what I was going for when i used hashset

ubiratansoares · 2026-04-17T18:27:23Z

+        people_table.insert("leads", toml_edit::value(toml_edit::Array::new()));
+        people_table.insert("members", toml_edit::value(toml_edit::Array::new()));


It seems that

toml_edit::Array::new().into()

works equality as

toml_edit::value(toml_edit::Array::new())

but it reads a bit shorter (also better, imho)

rustbot · 2026-04-22T14:14:27Z

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

Sandijigs · 2026-04-22T17:23:49Z

I've switched to IndexSet instead of the HashSet combo , It is definately more cleaner. Also swapped toml_edit::value() for .into() like @ubiratansoares suggested

Sandijigs requested review from Mark-Simulacrum, emilyalbini, jdno, marcoieni and ubiratansoares as code owners April 15, 2026 20:44

This comment has been minimized.

Sign in to view

Sandijigs force-pushed the add/archive-command branch from f71bf56 to 9335836 Compare April 15, 2026 20:49

This comment has been minimized.

Sign in to view

Sandijigs force-pushed the add/archive-command branch from 9335836 to dfedaf1 Compare April 15, 2026 21:11

Sandijigs force-pushed the add/archive-command branch from dfedaf1 to f595a4d Compare April 15, 2026 21:40

Sandijigs force-pushed the add/archive-command branch from f595a4d to dcb2e59 Compare April 16, 2026 20:47

marcoieni reviewed Apr 16, 2026

View reviewed changes

Sandijigs force-pushed the add/archive-command branch from dcb2e59 to ce7b140 Compare April 17, 2026 12:38

ubiratansoares reviewed Apr 17, 2026

View reviewed changes

This comment has been minimized.

Sign in to view

jieyouxu added needs-infra-admin-review This change requires one of the `infra-admins` to review. S-waiting-on-review Status: waiting on review from a team/WG/PG lead, an infra-admin, and/or a team-repo-admin. labels Apr 22, 2026

Sandijigs force-pushed the add/archive-command branch from ce7b140 to 323852a Compare April 22, 2026 11:32

Added CLI command to automate team and repo archival

fb54a10

Sandijigs force-pushed the add/archive-command branch from 323852a to fb54a10 Compare April 22, 2026 14:14

		let mut all_alumni: Vec<String> = Vec::new();
		let mut seen = HashSet::new();

		people_table.insert("leads", toml_edit::value(toml_edit::Array::new()));
		people_table.insert("members", toml_edit::value(toml_edit::Array::new()));

Conversation

Sandijigs commented Apr 15, 2026

Uh oh!

This comment has been minimized.

This comment has been minimized.

github-actions Bot commented Apr 15, 2026

Uh oh!

marcoieni commented Apr 15, 2026

Uh oh!

Sandijigs commented Apr 15, 2026

Uh oh!

marcoieni commented Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Sandijigs commented Apr 16, 2026

Uh oh!

marcoieni Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

marcoieni Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

marcoieni Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

marcoieni Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Sandijigs commented Apr 17, 2026

Uh oh!

ubiratansoares left a comment

Choose a reason for hiding this comment

Uh oh!

ubiratansoares Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

Sandijigs Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

ubiratansoares Apr 17, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment has been minimized.

rustbot commented Apr 22, 2026

Uh oh!

Sandijigs commented Apr 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

marcoieni commented Apr 15, 2026 •

edited

Loading

marcoieni Apr 16, 2026 •

edited

Loading