Merge branch 'master' into remco/fix/no-deny-warnings

.circleci/config.yml

@@ -64,8 +64,7 @@ jobs:
       - NIGHTLY: nightly-2019-08-15
         # Exclude substrate-node (also pulls in a lot of deps, and currently fails)
       - PACKAGES: --all --exclude substrate-node
-        # TODO: Add substrate-runtime to no-std once the hex-literal issue is resolved.
-      - NO_STD_PACKAGES: macros_decl u256 primefield ecc starkdex stark
+      - NO_STD_PACKAGES: macros_decl u256 primefield ecc starkdex stark substrate-runtime
     steps:
       - checkout
       - restore-toolchain-cache

Cargo.toml

@@ -17,3 +17,9 @@ members = [
 opt-level = 3
 lto = true
 panic = 'unwind'
+
+# HACK: Patch replace substrate's dependency on hex-literal with a local clone
+# that sets #[no_std].
+# TODO: Remove pending merger of https://github.com/RustCrypto/utils/pull/30
+[replace]
+"hex-literal:0.1.4" = { path = "./hex-literal" }

hex-literal/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "hex-literal"
+version = "0.1.4"
+authors = ["Remco Bloemen <[email protected]>"]
+edition = "2018"
+
+[dependencies]
+proc-macro-hack = "0.5"
+macros-impl = { path = "../macros_impl" }
+
+[features]
+default = []
+std = []

hex-literal/src/lib.rs

@@ -0,0 +1,11 @@
+#![warn(clippy::all)]
+#![deny(warnings)]
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use proc_macro_hack::proc_macro_hack;
+
+/// Hex literal.
+///
+/// (Documentation goes here on the re-export, not in the other crate.)
+#[proc_macro_hack]
+pub use macros_impl::hex;

substrate-runtime/src/block_proof.rs

@@ -2,6 +2,8 @@
 // allow the lint on the whole file scope.
 #![allow(clippy::default_trait_access)]
 
+// TODO - This code will be be reworked to incorporate it into a chain which
+// doesn't lock blocks to proofs.
 #[cfg(feature = "std")]
 use inherents::ProvideInherentData;
 use inherents::{InherentData, InherentIdentifier, IsFatalError, ProvideInherent, RuntimeString};