about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-02-11 00:53:05 +0800
committerkennytm <kennytm@gmail.com>2018-02-11 00:53:05 +0800
commit18d7be33819158c87c84fac5d9984634e202aac7 (patch)
tree824aeebcf4504eddbc4af366f2ca86e4d10ff233 /src/bootstrap
parentc888f723042c4f5d285e6c80acd9a18a343a2142 (diff)
parent7ee3e39f640a9532842e1441bf6bc98893b6a3ba (diff)
Rollup merge of #48120 - matthiaskrgr:typos_src_1, r=alexcrichton
fix typos in src/{bootstrap,ci,etc,lib{backtrace,core,fmt_macros}}

via codespell
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/builder.rs2
-rw-r--r--src/bootstrap/lib.rs2
-rw-r--r--src/bootstrap/test.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 9403c343d1d..74dd4a6fa01 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -570,7 +570,7 @@ impl<'a> Builder<'a> {
         // build scripts in that situation.
         //
         // If LLVM support is disabled we need to use the snapshot compiler to compile
-        // build scripts, as the new compiler doesnt support executables.
+        // build scripts, as the new compiler doesn't support executables.
         if mode == Mode::Libstd || !self.build.config.llvm_enabled {
             cargo.env("RUSTC_SNAPSHOT", &self.initial_rustc)
                  .env("RUSTC_SNAPSHOT_LIBDIR", self.rustc_snapshot_libdir());
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index a84a6a8990b..83c270865c0 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -666,7 +666,7 @@ impl Build {
         }
     }
 
-    /// Returns the path to the linker for the given target if it needs to be overriden.
+    /// Returns the path to the linker for the given target if it needs to be overridden.
     fn linker(&self, target: Interned<String>) -> Option<&Path> {
         if let Some(linker) = self.config.target_config.get(&target)
                                                        .and_then(|c| c.linker.as_ref()) {
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index eae8ec1311d..f6b95f0bf97 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -902,7 +902,7 @@ impl Step for Compiletest {
             }
         }
         if suite == "run-make" && !build.config.llvm_enabled {
-            println!("Ignoring run-make test suite as they generally dont work without LLVM");
+            println!("Ignoring run-make test suite as they generally don't work without LLVM");
             return;
         }