From 55a9284665dc6ef5d9db6f73e76630f22d3ea43d Mon Sep 17 00:00:00 2001 From: mokou Date: Sun, 14 Jun 2020 14:48:51 +0200 Subject: [PATCH] chore: Move from master branch to main branch --- install.sh | 4 ++-- src/exercise.rs | 2 +- src/main.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index c32f512..a19c280 100755 --- a/install.sh +++ b/install.sh @@ -115,8 +115,8 @@ then if [[ -z ${Version} ]] then echo "No valid tag version found" - echo "Rustlings will be installed using the master branch" - Version="master" + echo "Rustlings will be installed using the main branch" + Version="main" else Version="tags/${Version}" fi diff --git a/src/exercise.rs b/src/exercise.rs index 177b7f3..2108d81 100644 --- a/src/exercise.rs +++ b/src/exercise.rs @@ -134,7 +134,7 @@ path = "{}.rs""#, .expect("Failed to compile!"); // Due to an issue with Clippy, a cargo clean is required to catch all lints. // See https://github.com/rust-lang/rust-clippy/issues/2604 - // This is already fixed on master branch. See this issue to track merging into Cargo: + // This is already fixed on Clippy's master branch. See this issue to track merging into Cargo: // https://github.com/rust-lang/rust-clippy/issues/3837 Command::new("cargo") .args(&["clean", "--manifest-path", CLIPPY_CARGO_TOML_PATH]) diff --git a/src/main.rs b/src/main.rs index 9c64de2..aa67aca 100644 --- a/src/main.rs +++ b/src/main.rs @@ -132,7 +132,7 @@ fn main() { println!("You can also contribute your own exercises to help the greater community!"); println!(); println!("Before reporting an issue or contributing, please read our guidelines:"); - println!("https://github.com/rust-lang/rustlings/blob/master/CONTRIBUTING.md"); + println!("https://github.com/rust-lang/rustlings/blob/main/CONTRIBUTING.md"); } if matches.subcommand_name().is_none() {