about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Simulacrum <mark.simulacrum@gmail.com>2017-07-18 15:28:53 -0600
committerMark Simulacrum <mark.simulacrum@gmail.com>2017-07-20 11:24:37 -0600
commit981afa52f6e3fa61074a5e295c782cd0a84f06e1 (patch)
tree1ed4eef6cd7f51a3f14d8d48240517b7a41ee7c0
parentba1fc82fe4377dd7a7898b8354dcf7e2b3a0e685 (diff)
Krate -> Crate
-rw-r--r--src/bootstrap/builder.rs4
-rw-r--r--src/bootstrap/check.rs18
2 files changed, 11 insertions, 11 deletions
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
index 9993392ac46..77f8dda251b 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
@@ -156,9 +156,9 @@ impl<'a> Builder<'a> {
                 tool::Compiletest, tool::RemoteTestServer, tool::RemoteTestClient,
                 tool::RustInstaller, tool::Cargo, tool::Rls),
             Kind::Test => check!(builder, paths, check::Tidy, check::Bootstrap, check::Compiletest,
-                check::Krate, check::KrateLibrustc, check::Linkcheck, check::Cargotest,
+                check::Crate, check::CrateLibrustc, check::Linkcheck, check::Cargotest,
                 check::Cargo, check::Docs, check::ErrorIndex, check::Distcheck),
-            Kind::Bench => check!(builder, paths, check::Krate, check::KrateLibrustc),
+            Kind::Bench => check!(builder, paths, check::Crate, check::CrateLibrustc),
             Kind::Doc => builder.default_doc(Some(paths)),
             Kind::Dist => check!(builder, paths, dist::Docs, dist::Mingw, dist::Rustc,
                 dist::DebuggerScripts, dist::Std, dist::Analysis, dist::Src,
diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index fdbc821de55..6c41a76e70f 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -961,14 +961,14 @@ fn markdown_test(builder: &Builder, compiler: Compiler, markdown: &Path) {
 //         .run(move |s| check::krate(build, &s.compiler(), s.target,
 //                                    Mode::Librustc, TestKind::Test, None));
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub struct KrateLibrustc {
+pub struct CrateLibrustc {
     compiler: Compiler,
     target: Interned<String>,
     test_kind: TestKind,
     krate: Option<Interned<String>>,
 }
 
-impl Step for KrateLibrustc {
+impl Step for CrateLibrustc {
     type Output = ();
     const DEFAULT: bool = true;
     const ONLY_HOSTS: bool = true;
@@ -993,10 +993,10 @@ impl Step for KrateLibrustc {
             } else if builder.kind == Kind::Bench {
                 TestKind::Bench
             } else {
-                panic!("unexpected builder.kind in Krate: {:?}", builder.kind);
+                panic!("unexpected builder.kind in crate: {:?}", builder.kind);
             };
 
-            builder.ensure(KrateLibrustc {
+            builder.ensure(CrateLibrustc {
                 compiler,
                 target,
                 test_kind: test_kind,
@@ -1017,7 +1017,7 @@ impl Step for KrateLibrustc {
 
 
     fn run(self, builder: &Builder) {
-        builder.ensure(Krate {
+        builder.ensure(Crate {
             compiler: self.compiler,
             target: self.target,
             mode: Mode::Librustc,
@@ -1075,7 +1075,7 @@ impl Step for KrateLibrustc {
 //                                    Mode::Libtest, TestKind::Test, None));
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
-pub struct Krate {
+pub struct Crate {
     compiler: Compiler,
     target: Interned<String>,
     mode: Mode,
@@ -1083,7 +1083,7 @@ pub struct Krate {
     krate: Option<Interned<String>>,
 }
 
-impl Step for Krate {
+impl Step for Crate {
     type Output = ();
     const DEFAULT: bool = true;
 
@@ -1110,10 +1110,10 @@ impl Step for Krate {
             } else if builder.kind == Kind::Bench {
                 TestKind::Bench
             } else {
-                panic!("unexpected builder.kind in Krate: {:?}", builder.kind);
+                panic!("unexpected builder.kind in crate: {:?}", builder.kind);
             };
 
-            builder.ensure(Krate {
+            builder.ensure(Crate {
                 compiler, target,
                 mode: mode,
                 test_kind: test_kind,