Check CI env vars and tweak output

Author: estebank

Cargo.lock

@@ -635,6 +635,15 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "ci_info"
+version = "0.14.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62a62f39080c8c83e899dff6abd46c4fac05c1cf8dafece96ad8238e79addbf8"
+dependencies = [
+ "envmnt",
+]
+
 [[package]]
 name = "clap"
 version = "3.2.20"
@@ -1424,6 +1433,16 @@ dependencies = [
  "termcolor",
 ]
 
+[[package]]
+name = "envmnt"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d73999a2b8871e74c8b8bc23759ee9f3d85011b24fafc91a4b3b5c8cc8185501"
+dependencies = [
+ "fsio",
+ "indexmap",
+]
+
 [[package]]
 name = "errno"
 version = "0.2.8"
@@ -1629,6 +1648,15 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674"
 
+[[package]]
+name = "fsio"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dad0ce30be0cc441b325c5d705c8b613a0ca0d92b6a8953d41bd236dc09a36d0"
+dependencies = [
+ "dunce",
+]
+
 [[package]]
 name = "futf"
 version = "0.1.5"
@@ -3949,6 +3977,7 @@ version = "0.0.0"
 dependencies = [
  "backtrace",
  "chrono 0.2.25",
+ "ci_info",
  "libc",
  "rustc_ast",
  "rustc_ast_pretty",

compiler/rustc_driver/Cargo.toml

@@ -10,6 +10,7 @@ crate-type = ["dylib"]
 backtrace = "0.3.66"
 serde_json = "1.0.59"
 chrono = "0.2"
+ci_info = "0.14.9"
 urlqstring = "*"
 tracing = { version = "0.1.35" }
 rustc_log = { path = "../rustc_log" }

compiler/rustc_driver/src/lib.rs

@@ -1216,8 +1216,6 @@ fn write_ice_to_disk(info: &panic::PanicInfo<'_>) -> Result<(String, String), Ic
 
     writeln!(file, "{}", version)?;
     args.push(("version", version.as_str()));
-    let backtrace_msg = format!("please include the contents of `{}` here", path.display());
-    args.push(("backtrace", &backtrace_msg));
 
     if let Some((flags, excluded_cargo_defaults)) = extra_compiler_flags() {
         writeln!(file, "compiler flags:")?;
@@ -1229,8 +1227,6 @@ fn write_ice_to_disk(info: &panic::PanicInfo<'_>) -> Result<(String, String), Ic
         }
     }
     writeln!(file, "")?;
-    let mut text = String::new();
-    text.push_str(&format!("{:?} {:?}", info.message(), info.location()));
     match (info.message(), info.location()) {
         (Some(message), Some(location)) => {
             writeln!(file, "panicked at {location}:\n{message}")?;
@@ -1247,6 +1243,7 @@ fn write_ice_to_disk(info: &panic::PanicInfo<'_>) -> Result<(String, String), Ic
     }
 
     writeln!(file, "")?;
+    let capture = format!("{capture}");
     writeln!(file, "{capture}")?;
 
     // Be careful relying on global state here: this code is called from
@@ -1304,7 +1301,8 @@ static DEFAULT_HOOK: LazyLock<Box<dyn Fn(&panic::PanicInfo<'_>) + Sync + Send +
                         && std::env::var("RUSTC_BACKTRACE_FORCE").as_deref() != Ok("0")
                 },
             );
-            let written_ice = if !is_dev { write_ice_to_disk(info) } else { Err(IceError) };
+            let written_ice =
+                if !is_dev && !ci_info::is_ci() { write_ice_to_disk(info) } else { Err(IceError) };
             // Invoke the default handler, which prints the actual panic message and optionally a backtrace
             // Don't do this for delayed bugs, which already emit their own more useful backtrace.
             if !info.payload().is::<rustc_errors::DelayedBugPanic>() && written_ice.is_err() {
@@ -1359,8 +1357,7 @@ pub fn report_ice(
     }
 
     let xs: Vec<Cow<'static, str>> = if let Some((path, custom_url)) = &reported_ice {
-        let link = format!("\x1b]8;;{custom_url}\x1b\\{bug_report_url}\x1b]8;;\x1b\\");
-        let path = format!("\x1b]8;;file://{path}\x1b\\{path}\x1b]8;;\x1b\\");
+        let link = format!("\x1b]8;;{custom_url}\x07{bug_report_url}\x1b]8;;\x07");
         vec![
             format!("all necessary context about this bug was written to `{path}`").into(),
             format!("we would appreciate a bug report with this context at {link}").into(),