about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2022-06-21 22:18:26 -0700
committerJosh Triplett <josh@joshtriplett.org>2022-06-27 10:49:36 -0700
commitcf7cf48ea89903c2d99a1bfecb9da91c8c7040e7 (patch)
treefd1271b00bbf1b2db38b194a6b6c243789f93099
parentbd2e51a338e36372b200a22f3e0e22189a1063e6 (diff)
downloadrust-cf7cf48ea89903c2d99a1bfecb9da91c8c7040e7.tar.gz
rust-cf7cf48ea89903c2d99a1bfecb9da91c8c7040e7.zip
Export `t!` from the bootstrap lib so bins can use it
-rw-r--r--src/bootstrap/lib.rs3
-rw-r--r--src/bootstrap/util.rs3
2 files changed, 3 insertions, 3 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 859d35b7d7b..cf5ffdafbae 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -122,8 +122,7 @@ use once_cell::sync::OnceCell;
 use crate::builder::Kind;
 use crate::config::{LlvmLibunwind, TargetSelection};
 use crate::util::{
-    check_run, exe, libdir, mtime, output, run, run_suppressed, t, try_run, try_run_suppressed,
-    CiEnv,
+    check_run, exe, libdir, mtime, output, run, run_suppressed, try_run, try_run_suppressed, CiEnv,
 };
 
 mod builder;
diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs
index 4b2b058a780..6f4266a7f29 100644
--- a/src/bootstrap/util.rs
+++ b/src/bootstrap/util.rs
@@ -22,6 +22,7 @@ use crate::config::{Config, TargetSelection};
 ///
 /// This is currently used judiciously throughout the build system rather than
 /// using a `Result` with `try!`, but this may change one day...
+#[macro_export]
 macro_rules! t {
     ($e:expr) => {
         match $e {
@@ -37,7 +38,7 @@ macro_rules! t {
         }
     };
 }
-pub(crate) use t;
+pub use t;
 
 /// Given an executable called `name`, return the filename for the
 /// executable for a particular target.