From 1436e6d7345b5cc61e92e700c19e82cb37d0bd99 Mon Sep 17 00:00:00 2001 From: Gavin Wood Date: Mon, 6 May 2019 17:11:45 +0200 Subject: [PATCH] Fix std/core crates (#2489) - Add convert - Add btree_set for without_std --- substrate/core/sr-std/with_std.rs | 1 + substrate/core/sr-std/without_std.rs | 2 ++ 2 files changed, 3 insertions(+) diff --git a/substrate/core/sr-std/with_std.rs b/substrate/core/sr-std/with_std.rs index 9bf49ce6ed..d71b9dcb69 100644 --- a/substrate/core/sr-std/with_std.rs +++ b/substrate/core/sr-std/with_std.rs @@ -32,6 +32,7 @@ pub use std::slice; pub use std::vec; pub use std::default; pub use std::result; +pub use std::convert; pub mod collections { pub use std::collections::btree_map; diff --git a/substrate/core/sr-std/without_std.rs b/substrate/core/sr-std/without_std.rs index 71a2c01c29..9214a0ed2f 100755 --- a/substrate/core/sr-std/without_std.rs +++ b/substrate/core/sr-std/without_std.rs @@ -64,10 +64,12 @@ pub use core::ptr; pub use core::slice; pub use core::default; pub use core::result; +pub use core::convert; // We are trying to avoid certain things here, such as `core::string` // (if you need `String` you most probably doing something wrong, since // runtime doesn't require anything human readable). pub mod collections { pub use alloc::collections::btree_map; + pub use alloc::collections::btree_set; }