From: Matt Corallo <git@bluematt.me>
Date: Tue, 4 Jan 2022 22:34:15 +0000 (+0000)
Subject: Support building `cfg=c_bindings` with `no-std`
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=cb827ef048316ef39c5fb3b00fce1692ba38ccc3;p=rust-lightning

Support building `cfg=c_bindings` with `no-std`

This will be needed for JavaScript bindings eventually.
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 20ca306b1..96c629220 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -109,11 +109,14 @@ jobs:
         run: RUSTFLAGS="-C link-dead-code" cargo test --verbose --color always
       - name: Test on no-std bullds Rust ${{ matrix.toolchain }}
         if: "matrix.build-no-std && !matrix.coverage"
+        shell: bash # Default on Winblows is powershell
         run: |
           cd lightning
           cargo test --verbose --color always --no-default-features --features no-std
           # check if there is a conflict between no-std and the default std feature
           cargo test --verbose --color always --features no-std
+          # check if there is a conflict between no-std and the c_bindings cfg
+          RUSTFLAGS="--cfg=c_bindings" cargo test --verbose --color always --no-default-features --features=no-std
           cd ..
       - name: Test on no-std builds Rust ${{ matrix.toolchain }} and full code-linking for coverage generation
         if: "matrix.build-no-std && matrix.coverage"
diff --git a/lightning/src/util/logger.rs b/lightning/src/util/logger.rs
index f8fc1eda1..ff576e26d 100644
--- a/lightning/src/util/logger.rs
+++ b/lightning/src/util/logger.rs
@@ -17,6 +17,9 @@
 use core::cmp;
 use core::fmt;
 
+#[cfg(c_bindings)]
+use prelude::*; // Needed for String
+
 static LOG_LEVEL_NAMES: [&'static str; 6] = ["GOSSIP", "TRACE", "DEBUG", "INFO", "WARN", "ERROR"];
 
 /// An enum representing the available verbosity levels of the logger.