Skip to content

feat: Update default rust branch to "main" #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ehuss merged 1 commit into from
Nov 12, 2025
Merged

feat: Update default rust branch to "main" #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bin/subup-msg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ fn main() {
Arg::with_name("branch")
.long("branch")
.help("Parent branch")
.default_value("master"),
.default_value("main"),
)
.get_matches();

Expand Down
24 changes: 12 additions & 12 deletions src/bin/subup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ struct SubUp<'a> {
cli: &'a Cli<'a>,
/// All submodules in the repo.
submodules: Vec<Submodule>,
/// The target branch of the rust repo (master/beta/stable)
/// The target branch of the rust repo (main/beta/stable)
rust_branch: String,
/// The branch name to create for the pull request.
up_branch: String,
Expand Down Expand Up @@ -127,11 +127,11 @@ impl<'a> SubUp<'a> {
}

// Check rust_branch.
if self.rust_branch == "master" {
self.cli.info("Using branch `master`")?;
if self.rust_branch == "main" {
self.cli.info("Using branch `main`")?;
} else {
self.cli
.warning(&format!("Using non-master branch `{}`", self.rust_branch))?;
.warning(&format!("Using non-main branch `{}`", self.rust_branch))?;
}

// Check upstream.
Expand Down Expand Up @@ -202,7 +202,7 @@ impl<'a> SubUp<'a> {
for arg in self.cli.matches.values_of("submodules").unwrap() {
let parts: Vec<_> = arg.splitn(2, ':').collect();
let (path, rev) = if parts.len() == 1 {
if self.rust_branch != "master" {
if self.rust_branch != "main" {
self.cli.warning(&format!(
"Did not specify a branch for module `{}`.",
parts[0]
Expand Down Expand Up @@ -654,7 +654,7 @@ impl<'a> SubUp<'a> {
if self.cli.matches.is_present("self-assign") {
args.push("--assignee=@me");
}
if self.rust_branch != "master" {
if self.rust_branch != "main" {
args.push("--base");
args.push(&self.rust_branch);
}
Expand Down Expand Up @@ -744,7 +744,7 @@ fn up_branch(cli: &Cli<'_>, rust_branch: &str) -> String {
// Compute the branch name.
let mut parts = Vec::new();
parts.push(Cow::from("update"));
if rust_branch != "master" {
if rust_branch != "main" {
parts.push(Cow::from(rust_branch));
}
parts.extend(
Expand All @@ -757,20 +757,20 @@ fn up_branch(cli: &Cli<'_>, rust_branch: &str) -> String {
}
}

/// Determine the base branch name to use (master/beta/stable).
/// Determine the base branch name to use (main/beta/stable).
fn rust_branch(cli: &Cli<'_>) -> Result<String, Error> {
if let Some(branch) = cli.matches.value_of("rust-branch") {
Ok(branch.to_string())
} else {
let branch = cli
.git("symbolic-ref --short HEAD")
.capture_stdout("Could not determine current branch.")?;
if !["master", "beta", "stable"].iter().any(|b| *b == branch) {
if !["main", "beta", "stable"].iter().any(|b| *b == branch) {
cli.warning(&format!(
"Current branch `{}` is not master/beta/stable.",
"Current branch `{}` is not main/beta/stable.",
branch
))?;
let branch = cli.input("Which base branch do you want to use?", Some("master"))?;
let branch = cli.input("Which base branch do you want to use?", Some("main"))?;
if let Some(branch) = branch {
return Ok(branch);
} else {
Expand Down Expand Up @@ -846,7 +846,7 @@ fn main() {
Arg::with_name("rust-branch")
.long("rust-branch")
.takes_value(true)
.help("The target rust branch (master/beta/stable)"),
.help("The target rust branch (main/beta/stable)"),
)
.arg(
Arg::with_name("up-branch")
Expand Down