From 1a99ac6b4a378bac654cffb0061c96a3b5f2254a Mon Sep 17 00:00:00 2001
From: bjorn3 <bjorn3@users.noreply.github.com>
Date: Sat, 28 Sep 2019 15:57:43 +0200
Subject: [PATCH] Always use extern crate std in cranelift-frontend

---
 cranelift/frontend/src/frontend.rs | 4 ++--
 cranelift/frontend/src/lib.rs      | 5 ++---
 cranelift/frontend/src/ssa.rs      | 2 +-
 cranelift/frontend/src/switch.rs   | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cranelift/frontend/src/frontend.rs b/cranelift/frontend/src/frontend.rs
index 6204071618..15488f7c2a 100644
--- a/cranelift/frontend/src/frontend.rs
+++ b/cranelift/frontend/src/frontend.rs
@@ -13,7 +13,7 @@ use cranelift_codegen::ir::{
 };
 use cranelift_codegen::isa::{TargetFrontendConfig, TargetIsa};
 use cranelift_codegen::packed_option::PackedOption;
-use std::vec::Vec;
+use alloc::vec::Vec;
 
 /// Structure used for translating a series of functions into Cranelift IR.
 ///
@@ -899,7 +899,7 @@ mod tests {
     use cranelift_codegen::isa::CallConv;
     use cranelift_codegen::settings;
     use cranelift_codegen::verifier::verify_function;
-    use std::string::ToString;
+    use alloc::string::ToString;
 
     fn sample_function(lazy_seal: bool) {
         let mut sig = Signature::new(CallConv::SystemV);
diff --git a/cranelift/frontend/src/lib.rs b/cranelift/frontend/src/lib.rs
index 5e53944901..6357eae9bb 100644
--- a/cranelift/frontend/src/lib.rs
+++ b/cranelift/frontend/src/lib.rs
@@ -183,9 +183,8 @@
 )]
 #![no_std]
 
-#[cfg(not(feature = "std"))]
-#[macro_use]
-extern crate alloc as std;
+extern crate alloc;
+
 #[cfg(feature = "std")]
 #[macro_use]
 extern crate std;
diff --git a/cranelift/frontend/src/ssa.rs b/cranelift/frontend/src/ssa.rs
index b3b74fac9b..0175c6381d 100644
--- a/cranelift/frontend/src/ssa.rs
+++ b/cranelift/frontend/src/ssa.rs
@@ -17,7 +17,7 @@ use cranelift_codegen::ir::{Ebb, Function, Inst, InstBuilder, InstructionData, T
 use cranelift_codegen::packed_option::PackedOption;
 use cranelift_codegen::packed_option::ReservedValue;
 use smallvec::SmallVec;
-use std::vec::Vec;
+use alloc::vec::Vec;
 
 /// Structure containing the data relevant the construction of SSA for a given function.
 ///
diff --git a/cranelift/frontend/src/switch.rs b/cranelift/frontend/src/switch.rs
index 0b1ca746cb..7353d7d049 100644
--- a/cranelift/frontend/src/switch.rs
+++ b/cranelift/frontend/src/switch.rs
@@ -3,7 +3,7 @@ use crate::frontend::FunctionBuilder;
 use cranelift_codegen::ir::condcodes::IntCC;
 use cranelift_codegen::ir::*;
 use log::debug;
-use std::vec::Vec;
+use alloc::vec::Vec;
 
 type EntryIndex = u64;
 
@@ -291,7 +291,7 @@ mod tests {
     use super::*;
     use crate::frontend::FunctionBuilderContext;
     use cranelift_codegen::ir::Function;
-    use std::string::ToString;
+    use alloc::string::ToString;
 
     macro_rules! setup {
         ($default:expr, [$($index:expr,)*]) => {{