Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix cid serde feature reference #235

Merged
merged 2 commits into from
Feb 20, 2020
Merged

Fix cid serde feature reference #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f805c8
Fix cid serde feature
austinabell Feb 19, 2020
b4b03f5
Add CI check for Forest binary
austinabell Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/ci-rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ jobs:
command: clippy
args: -- -D warnings

- name: Check forest binary
uses: actions-rs/cargo@v1
with:
command: check
args: -p forest

publish_docs:
if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
name: Publish Documentation
Expand Down
2 changes: 1 addition & 1 deletion blockchain/blocks/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ address = { package = "forest_address", path = "../../vm/address" }
crypto = { path = "../../crypto" }
message = { package = "forest_message", path = "../../vm/message" }
clock = { path = "../../node/clock" }
cid = { package = "forest_cid", path = "../../ipld/cid" }
cid = { package = "forest_cid", path = "../../ipld/cid", features = ["serde_derive"] }
derive_builder = "0.9"
serde = { version = "1.0", features = ["derive"] }
encoding = { package = "forest_encoding", path = "../../encoding" }
Expand Down
4 changes: 2 additions & 2 deletions ipld/cid/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ impl Default for Cid {
}
}

#[cfg(feature = "serde")]
#[cfg(feature = "serde_derive")]
impl ser::Serialize for Cid {
fn serialize<S>(&self, s: S) -> Result<S::Ok, S::Error>
where
Expand All @@ -74,7 +74,7 @@ impl ser::Serialize for Cid {
}
}

#[cfg(feature = "serde")]
#[cfg(feature = "serde_derive")]
impl<'de> de::Deserialize<'de> for Cid {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
where
Expand Down