about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoshua Nelson <jnelson@cloudflare.com>2021-12-09 11:14:49 -0600
committerJoshua Nelson <jnelson@cloudflare.com>2021-12-09 11:30:38 -0600
commit8a6f54fc3a4e8cbe71396b1fd51f5dc718e50f08 (patch)
tree3e20b53c95543d6364991d152b365803bdb8ab94
parent3b263ceb5cb89b6d53b5a03b47ec447c3a7f7765 (diff)
downloadrust-8a6f54fc3a4e8cbe71396b1fd51f5dc718e50f08.tar.gz
rust-8a6f54fc3a4e8cbe71396b1fd51f5dc718e50f08.zip
Use more accurate wording in `bootstrap.py` logging
-rw-r--r--src/bootstrap/bootstrap.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index ca7ad532030..0cd0fabe9b1 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -189,11 +189,11 @@ def default_build_triple(verbose):
         host = next(x for x in version.split('\n') if x.startswith("host: "))
         triple = host.split("host: ")[1]
         if verbose:
-            print("detected default triple {}".format(triple))
+            print("detected default triple {} from pre-installed rustc".format(triple))
         return triple
     except Exception as e:
         if verbose:
-            print("rustup not detected: {}".format(e))
+            print("pre-installed rustc not detected: {}".format(e))
             print("falling back to auto-detect")
 
     required = sys.platform != 'win32'
@@ -727,11 +727,11 @@ class RustBuild(object):
         if status != 0:
             if download_rustc == "if-unchanged":
                 return None
-            print("warning: `download-rustc` is enabled, but there are changes to \
-                   compiler/ or library/")
+            print("warning: `download-rustc` is enabled, but there are changes to " \
+                  "compiler/ or library/")
 
         if self.verbose:
-            print("using downloaded stage1 artifacts from CI (commit {})".format(commit))
+            print("using downloaded stage2 artifacts from CI (commit {})".format(commit))
         self.rustc_commit = commit
         # FIXME: support downloading artifacts from the beta channel
         self.download_toolchain(False, "nightly")