42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
|
From 7b30ddc41c71e89d3e6ab6840b0206877d68f201 Mon Sep 17 00:00:00 2001
|
||
|
|
From: bjorn3 <bjorn3@users.noreply.github.com>
|
||
|
|
Date: Sun, 25 Aug 2019 16:23:06 +0200
|
||
|
|
Subject: [PATCH] [libtest] Don't require panic_unwind
|
||
|
|
|
||
|
|
---
|
||
|
|
src/libtest/lib.rs | 11 -----------
|
||
|
|
1 file changed, 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
|
||
|
|
index 9bb76f9..c5fe1aa 100644
|
||
|
|
--- a/src/libtest/lib.rs
|
||
|
|
+++ b/src/libtest/lib.rs
|
||
|
|
@@ -24,7 +24,6 @@
|
||
|
|
#![cfg_attr(any(unix, target_os = "cloudabi"), feature(libc, rustc_private))]
|
||
|
|
#![feature(nll)]
|
||
|
|
#![feature(set_stdio)]
|
||
|
|
-#![feature(panic_unwind)]
|
||
|
|
#![feature(staged_api)]
|
||
|
|
#![feature(termination_trait_lib)]
|
||
|
|
#![feature(test)]
|
||
|
|
@@ -34,16 +33,6 @@ use getopts;
|
||
|
|
extern crate libc;
|
||
|
|
use term;
|
||
|
|
|
||
|
|
-// FIXME(#54291): rustc and/or LLVM don't yet support building with panic-unwind
|
||
|
|
-// on aarch64-pc-windows-msvc, or thumbv7a-pc-windows-msvc
|
||
|
|
-// so we don't link libtest against libunwind (for the time being)
|
||
|
|
-// even though it means that libtest won't be fully functional on
|
||
|
|
-// these platforms.
|
||
|
|
-//
|
||
|
|
-// See also: https://github.com/rust-lang/rust/issues/54190#issuecomment-422904437
|
||
|
|
-#[cfg(not(all(windows, any(target_arch = "aarch64", target_arch = "arm"))))]
|
||
|
|
-extern crate panic_unwind;
|
||
|
|
-
|
||
|
|
pub use self::ColorConfig::*;
|
||
|
|
use self::NamePadding::*;
|
||
|
|
use self::OutputLocation::*;
|
||
|
|
--
|
||
|
|
2.20.1
|
||
|
|
|