update uses of master/slave terminology

mostly master->main part of #5251
supercollider · Apr 17, 2021 · a01a019 · a01a019
1 parent f3d204f
commit a01a019
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/HelpSource/Tutorials/JITLib/recursive_phrasing.schelp b/HelpSource/Tutorials/JITLib/recursive_phrasing.schelp
@@ -339,7 +339,7 @@ Pdef(\sweep, { arg sustain=1, n=8, degree=0, ratio=1;
 )
 
 
-// drunken master
+// woozy
 (
 Pbind(
 	\type, \phrase,

diff --git a/package/contributor-list-generator/package.json b/package/contributor-list-generator/package.json
@@ -1,7 +1,7 @@
 {
   "name": "supercollider",
   "version": "1.0.0",
-  "description": "[![Build Status](https://travis-ci.org/supercollider/supercollider.svg?branch=master)](https://travis-ci.org/supercollider/supercollider)",
+  "description": "",
   "main": "changelog.js",
   "directories": {
     "example": "examples"

diff --git a/server/supernova/dsp_thread_queue/dsp_thread.hpp b/server/supernova/dsp_thread_queue/dsp_thread.hpp
@@ -184,7 +184,7 @@ class dsp_thread_pool {
         const bool run_tick = interpreter.init_tick();
         if (likely(run_tick)) {
             wake_threads();
-            interpreter.tick_master();
+            interpreter.tick_main();
         }
     }
 

diff --git a/server/supernova/dsp_thread_queue/dsp_thread_queue.hpp b/server/supernova/dsp_thread_queue/dsp_thread_queue.hpp
@@ -490,15 +490,15 @@ template <typename runnable, typename Alloc = std::allocator<void*>> class dsp_q
     }
 
 public:
-    void tick_master(void) {
+    void tick_main(void) {
         if (yield_if_busy)
-            run_item_master<true>();
+            run_item_main<true>();
         else
-            run_item_master<false>();
+            run_item_main<false>();
     }
 
 private:
-    template <bool YieldBackoff> void run_item_master(void) {
+    template <bool YieldBackoff> void run_item_main(void) {
         run_item<YieldBackoff>(0);
         wait_for_end<YieldBackoff>();
         assert(runnable_items.empty());

diff --git a/testsuite/sclang/lpc/LPCTestUtils.sc b/testsuite/sclang/lpc/LPCTestUtils.sc
@@ -257,7 +257,7 @@ LPCTestUtils {
 		var prevOutputs = nil!2;
 		var reps = 0!2; // repetition counters
 
-		// Master state (suffix `M` = `master`)
+		// Main state (suffix `M` = `main`)
 		// Necessary for the case when alphabets differ in size.
 		var alphM = alphs.flatten(1).collect(_.asSymbol).asSet.asArray
 		              .collect(_.asString).sort;
@@ -273,15 +273,15 @@ LPCTestUtils {
 
 		// alphM.postln;
 
-		// Stop when the master alphabet has been exhausted.
+		// Stop when the main alphabet has been exhausted.
 		while { hasNext } {
 
 			inputs = alphs.collect({ |alph, i| alph[ctrs[i]] });
 			inputM = alphM[ctrM];
 
-			// Get each file's output for the current master input. If a file's alphabet doesn't
+			// Get each file's output for the current main input. If a file's alphabet doesn't
 			// include the string, use `nil`. Since alphabets are sorted in lexicographical order,
-			// component alphabets can only skip ahead of the master alphabet's order.
+			// component alphabets can only skip ahead of the main alphabet's order.
 			inputs.do({
 				arg input, i;
 				var line;

diff --git a/tools/clang-format.py b/tools/clang-format.py
@@ -215,7 +215,7 @@ def get_merge_base(self, commit):
 
     def get_branch_name(self):
         """Get the current branch name, short form
-           This returns "master", not "refs/head/master"
+           This returns "main", not "refs/head/main"
            Will not work if the current branch is detached
         """
         branch = self.rev_parse(["--abbrev-ref", "HEAD"])
@@ -341,7 +341,7 @@ def validate_repo_state_for_rebase(commit_before_reformat, commit_after_reformat
             " before running this script.\n\nTo interactively rebase, use `git rebase -i %s`") %
             (merge_base, commit_before_reformat, commit_before_reformat))
 
-    # We assume the target branch is master, it could be a different branch if needed for testing
+    # We assume the target branch is main, it could be a different branch if needed for testing
     merge_base = repo.get_merge_base(target_branch)
 
     if not merge_base == repo.rev_parse([commit_before_reformat]):

diff --git a/tools/release/make_release.py b/tools/release/make_release.py
@@ -75,7 +75,7 @@ def main(version: Version):
         f"Have you made sure the schelp file '{schelp_news_page_title}' is up to date with the changelog by running the conversion script?", # XXX where is the script?
         f"Have you made sure HelpSource/Help.schelp points to the latest '{schelp_news_page_title}' schelp file?",
         ["If this is a proper release, have you updated the release history in CHANGELOG.md?", f"https://github.com/supercollider/supercollider/blob/{release_branch_name}/CHANGELOG.md#change-log"],
-        "If this is a proper release, have you merged the current release branch into master with git merge --no-ff?",
+        "If this is a proper release, have you merged the current release branch into main with git merge --no-ff?",
         "Have you tagged the release?",
         "Did you create the release announcement text?",
         ["Have you created a release on GitHub?", "https://github.com/supercollider/supercollider/releases/new"],
@@ -105,8 +105,8 @@ def main(version: Version):
         # maybe remove? or indicate optional?
         "Did you announce on Reddit (/r/supercollider)?",
 
-        ["If it's a beta release, did you merge the current release branch into develop? Do not merge the release branch into master yet!", f"https://github.com/supercollider/supercollider/compare/develop...{release_branch_name}"],
-        ["If it's a proper release, did you merge master into develop?", "https://github.com/supercollider/supercollider/compare/develop...master"]
+        ["If it's a beta release, did you merge the current release branch into develop? Do not merge the release branch into main yet!", f"https://github.com/supercollider/supercollider/compare/develop...{release_branch_name}"],
+        ["If it's a proper release, did you merge main into develop?", "https://github.com/supercollider/supercollider/compare/develop...main"]
             ]
 
     stack = deque()
-Original file line number
+Diff line change
@@ Expand Up / @@ -339,7 +339,7 @@ Pdef(\sweep, { arg sustain=1, n=8, degree=0, ratio=1; @@
     )
-    // drunken master
+    // woozy
     (
     Pbind(
     	\type, \phrase,
@@ Expand Down @@