Skip to content

Commit a77d022

Browse files
committed
add serde feature to CI tests and fix all issues to make these tests pass
1 parent 3971369 commit a77d022

24 files changed

+25
-28
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
matrix:
1616
rust: [stable]
17-
FEATURES: ['', 'from_str', 'std']
17+
FEATURES: ['', 'from_str', 'std', 'serde']
1818

1919
include:
2020
# Test nightly but don't fail

src/acceleration.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use std::str::FromStr;
2424
/// println!("You accelerated over {} at an average of {}", track, accel);
2525
///}
2626
/// ```
27-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
27+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
2828
#[derive(Copy, Clone, Debug, Default)]
2929
pub struct Acceleration {
3030
meters_per_second_per_second: f64,

src/angle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ use std::str::FromStr;
1919
/// let slice = whole_cake / pieces;
2020
/// println!("Each slice will be {} degrees", slice.as_degrees());
2121
/// ```
22-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
22+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
2323
#[derive(Copy, Clone, Debug, Default)]
2424
pub struct Angle {
2525
radians: f64,

src/angular_velocity.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use std::str::FromStr;
1818
/// let engine_speed = AngularVelocity::from_rpm(9000.0);
1919
/// let sparks_per_second = (engine_speed.as_hertz() / 2.0) * cylinders;
2020
/// ```
21-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
21+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
2222
#[derive(Copy, Clone, Debug, Default)]
2323
pub struct AngularVelocity {
2424
radians_per_second: f64,

src/area.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const SQUARE_METER_ACRE_FACTOR: f64 = 1.0 / 4046.86;
2222
/// let acres = football_field.as_acres();
2323
/// println!("There are {} acres in a football field.", acres);
2424
/// ```
25-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
25+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
2626
#[derive(Copy, Clone, Debug, Default)]
2727
pub struct Area {
2828
square_meters: f64,
@@ -318,7 +318,7 @@ impl FromStr for Area {
318318

319319
let re = Regex::new(r"(?i)\s*([0-9.]*)\s?([a-z2\u{00B2}\u{00B5} ]{1,5})\s*$").unwrap();
320320
if let Some(caps) = re.captures(val) {
321-
println!("{:?}", caps);
321+
println!("{caps:?}");
322322
let float_val = caps.get(1).unwrap().as_str();
323323
return Ok(
324324
match caps.get(2).unwrap().as_str().trim().to_lowercase().as_str() {

src/current.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ use super::measurement::*;
1515
/// let u_a = amperes.as_microamperes();
1616
/// println!("35 mA correspond to {} A or {} µA", a, u_a);
1717
/// ```
18-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
18+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
1919
#[derive(Copy, Clone, Debug, Default)]
2020
pub struct Current {
2121
amperes: f64,

src/data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const OCTET_TEBIOCTET_FACTOR: f64 = 1024.0 * 1024.0 * 1024.0 * 1024.0;
2929
/// let octets = file_size.as_octets();
3030
/// println!("There are {} octets in that file.", octets);
3131
/// ```
32-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
32+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
3333
#[derive(Copy, Clone, Debug, Default)]
3434
pub struct Data {
3535
octets: f64,

src/density.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub const LBCF_KGCM_FACTOR: f64 = 0.062427973725314;
3535
/// let ounces = (density * Volume::from_quarts(1.0)).as_ounces();
3636
/// println!("Answer is {} ounces per quart", ounces);
3737
/// ```
38-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
38+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
3939
#[derive(Copy, Clone, Debug, Default)]
4040
pub struct Density {
4141
kilograms_per_cubic_meter: f64,

src/energy.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use super::measurement::*;
1313
/// let energy = Energy::from_kcalories(2500.0);
1414
/// println!("Some say a health adult male should consume {} per day", energy);
1515
/// ```
16-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
16+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
1717
#[derive(Copy, Clone, Debug, Default)]
1818
pub struct Energy {
1919
joules: f64,

src/force.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub const DYNES_PER_NEWTON: f64 = 1e5;
2828
/// "One metric ton exerts a force of {} due to gravity",
2929
/// force);
3030
/// ```
31-
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
31+
#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
3232
#[derive(Copy, Clone, Debug, Default)]
3333
pub struct Force {
3434
newtons: f64,

0 commit comments

Comments
 (0)