Skip to content

Commit 4ecc411

Browse files
Merge pull request #21 from nicholaschiasson/patch/add-no_std
Patch/add no std
2 parents 1719c44 + 5e7340d commit 4ecc411

File tree

4 files changed

+10
-26
lines changed

4 files changed

+10
-26
lines changed

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
then
123123
BINARY_NAME=${BINARY_NAME}.exe
124124
fi
125-
cargo build --release --verbose
125+
cargo build --features=std --release --verbose
126126
cp target/release/${BINARY_NAME} ./
127127
tar czf ${RAW_BINARY_NAME}-${{ runner.os }}-${{ runner.arch }}.tar.gz ${BINARY_NAME}
128128
- name: Upload Build Artifact

src/fcidr.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
use alloc::{borrow::ToOwned, rc::Rc, vec::Vec};
1+
#[allow(unused_imports)]
2+
use alloc::string::ToString;
3+
4+
use alloc::{borrow::ToOwned, rc::Rc, vec, vec::Vec};
25
use core::cell::RefCell;
36

47
use crate::Cidr;

src/lib.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![no_std]
2+
13
extern crate alloc;
24

35
mod cidr;

src/serde.rs

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#![cfg(feature = "serde")]
22
#![cfg_attr(doc_cfg, doc(cfg(feature = "serde")))]
33

4+
use alloc::string::ToString;
45
use core::str::FromStr;
56

67
use serde::{de::Visitor, ser::SerializeSeq, Deserialize, Serialize};
@@ -12,7 +13,7 @@ struct CidrVisitor;
1213
impl<'de> Visitor<'de> for CidrVisitor {
1314
type Value = Cidr;
1415

15-
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
16+
fn expecting(&self, formatter: &mut core::fmt::Formatter) -> core::fmt::Result {
1617
formatter.write_str("a cidr block")
1718
}
1819

@@ -47,7 +48,7 @@ struct FcidrVisitor;
4748
impl<'de> Visitor<'de> for FcidrVisitor {
4849
type Value = Fcidr;
4950

50-
fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
51+
fn expecting(&self, formatter: &mut core::fmt::Formatter) -> core::fmt::Result {
5152
formatter.write_str("a list of cidr blocks")
5253
}
5354

@@ -84,25 +85,3 @@ impl Serialize for Fcidr {
8485
seq.end()
8586
}
8687
}
87-
88-
#[cfg(test)]
89-
mod tests {
90-
use super::*;
91-
92-
#[test]
93-
fn it_works() {
94-
let cidr: Cidr = serde_json::from_str("\"127.0.1.2/31\"").unwrap();
95-
println!("{cidr}");
96-
println!(
97-
"{}",
98-
serde_json::json!("128.0.0.0/30".parse::<Cidr>().unwrap())
99-
);
100-
let mut fcidr = Fcidr::new("10.0.0.0/8".parse().unwrap());
101-
fcidr.difference("10.128.128.127/32".parse().unwrap());
102-
println!("{}", serde_json::json!(fcidr));
103-
let fcidr: Fcidr = serde_json::from_str("[\"10.0.0.0/9\",\"10.128.0.0/17\",\"10.128.128.0/26\",\"10.128.128.64/27\",\"10.128.128.96/28\",\"10.128.128.112/29\",\"10.128.128.120/30\",\"10.128.128.124/31\",\"10.128.128.126/32\",\"10.128.128.128/25\",\"10.128.129.0/24\",\"10.128.130.0/23\",\"10.128.132.0/22\",\"10.128.136.0/21\",\"10.128.144.0/20\",\"10.128.160.0/19\",\"10.128.192.0/18\",\"10.129.0.0/16\",\"10.130.0.0/15\",\"10.132.0.0/14\",\"10.136.0.0/13\",\"10.144.0.0/12\",\"10.160.0.0/11\",\"10.192.0.0/10\"]").unwrap();
104-
for (i, cidr) in fcidr.iter().enumerate() {
105-
println!("{i} - {cidr}");
106-
}
107-
}
108-
}

0 commit comments

Comments
 (0)