tokio-rs/bytes
1
0
Fork 0
mirror of https://github.com/tokio-rs/bytes.git synced 2026-08-25 00:00:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix build fail with serde feature (#293)

Browse Source 
Verify no-std build and all features build
This commit is contained in:
Taiki Endo
2019-09-08 22:10:46 +02:00
committed by Douman
parent 97c1338833
commit ebe96021b0
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci/azure-test-stable.yml
+9 -5
View File
@@ -29,9 +29,9 @@ jobs:
displayName: cargo ${{ parameters.cmd }} displayName: cargo ${{ parameters.cmd }}
# Run with each specified feature # Run with each specified feature
- ${{ each feature in parameters.features.value }}: - ${{ each feature in parameters.features }}:
- script: cargo ${{ parameters.cmd }} --features ${{ feature }} - script: cargo ${{ parameters.cmd }} --features ${{ feature }}
displayName: cargo ${{ parameters.cmd }} --tests --features ${{ feature }} displayName: cargo ${{ parameters.cmd }} --features ${{ feature }}
- ${{ if eq(parameters.cmd, 'test') }}: - ${{ if eq(parameters.cmd, 'test') }}:
- script: cargo doc --no-deps - script: cargo doc --no-deps
@@ -41,6 +41,10 @@ jobs:
- script: cargo check --benches - script: cargo check --benches
displayName: Check benchmarks displayName: Check benchmarks
# Run with no default defaults # Run with all features
- script: cargo ${{ parameters.cmd }} - script: cargo ${{ parameters.cmd }} --all-features
displayName: cargo ${{ parameters.cmd }} --no-default-features displayName: cargo ${{ parameters.cmd }} --all-features
# Run with no default features
- script: cargo check --no-default-features
displayName: cargo check --no-default-features
src/serde.rs
+7 -5
View File
@@ -1,9 +1,11 @@
use alloc::string::String;
use alloc::vec::Vec;
use core::{cmp, fmt}; use core::{cmp, fmt};
use serde::{Serialize, Serializer, Deserialize, Deserializer, de}; use serde::{Serialize, Serializer, Deserialize, Deserializer, de};
use super::{Bytes, BytesMut}; use super::{Bytes, BytesMut};
macro_rules! serde_impl { macro_rules! serde_impl {
($ty:ident, $visitor_ty:ident) => ( ($ty:ident, $visitor_ty:ident, $from_slice:ident) => (
impl Serialize for $ty { impl Serialize for $ty {
#[inline] #[inline]
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
@@ -40,7 +42,7 @@ macro_rules! serde_impl {
fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E> fn visit_bytes<E>(self, v: &[u8]) -> Result<Self::Value, E>
where E: de::Error where E: de::Error
{ {
Ok($ty::from(v)) Ok($ty::$from_slice(v))
} }
#[inline] #[inline]
@@ -54,7 +56,7 @@ macro_rules! serde_impl {
fn visit_str<E>(self, v: &str) -> Result<Self::Value, E> fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
where E: de::Error where E: de::Error
{ {
Ok($ty::from(v)) Ok($ty::$from_slice(v.as_bytes()))
} }
#[inline] #[inline]
@@ -76,5 +78,5 @@ macro_rules! serde_impl {
); );
} }
serde_impl!(Bytes, BytesVisitor); serde_impl!(Bytes, BytesVisitor, copy_from_slice);
serde_impl!(BytesMut, BytesMutVisitor); serde_impl!(BytesMut, BytesMutVisitor, from);