Skip to content

Commit 1c033f3

Browse files
authored
feat: Clean up dependency tree (#3)
* feat: Add bundle::fps_task::Bundle object * chore: Fix warning for unused imports in certain build configs * dep: Remove thiserror dependency, and tighten other feature deps * doc: Update README * Revert "feat: Add bundle::fps_task::Bundle object" This reverts commit 35b8379.
1 parent 22750ef commit 1c033f3

5 files changed

Lines changed: 27 additions & 15 deletions

File tree

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ repository = "https://github.com/ATLAS-Space-Operations/rust-freedom-models"
1111
[dependencies]
1212
ipnet = { version = "2.11.0" }
1313
strum = { version = "0.25.0", features = ["derive"] }
14-
thiserror = { version = "1.0.56" }
15-
time = { version = "0.3.36", features = ["serde-human-readable", "macros"] }
14+
time = { version = "0.3.36" }
1615
url = { version = "2.5.0" }
1716

1817
# Optional dependencies
@@ -21,6 +20,7 @@ serde_with = { version = "3.3.0", optional = true }
2120

2221
[dev-dependencies]
2322
serde_json = { version = "1.0.111" }
23+
time = { version = "0.3.36", features = ["macros"] }
2424

2525
[features]
26-
serde = ["dep:serde", "dep:serde_with", "url/serde", "ipnet/json"]
26+
serde = ["dep:serde", "dep:serde_with", "url/serde", "ipnet/json", "time/serde-human-readable"]

README.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
[![Crates.io](https://img.shields.io/crates/v/freedom-models.svg)](https://crates.io/crates/freedom-models)
44
[![Documentation](https://docs.rs/freedom-models/badge.svg)](https://docs.rs/freedom-models/)
55

6-
Contains rust data structures which map to Freedom resources to simplify usage
7-
of the API
6+
Contains data structures which map to Freedom resources to simplify usage
7+
of the [Freedom API](https://github.com/ATLAS-Space-Operations/rust-freedom-api)
88

9+
## HATEOAS Trait
10+
11+
In addition, the library exposes a single trait `Hateoas`. This is
12+
useful for navigating the
13+
[HATEOAS](https://en.wikipedia.org/wiki/HATEOAS) structure of the API.

src/error.rs

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
11
#[cfg(feature = "serde")]
22
use serde::Deserialize;
3-
use thiserror::Error;
43

54
#[cfg_attr(
65
feature = "serde",
76
derive(Deserialize),
87
serde(rename_all = "camelCase")
98
)]
10-
#[derive(Debug, Clone, Error, PartialEq, Eq)]
9+
#[derive(Debug, Clone, PartialEq, Eq)]
1110
pub enum Error {
12-
#[error("An item within the inner paginated structure failed to deserialize")]
1311
PaginatedInner,
14-
15-
#[error("The inner list of paginated elements is missing")]
1612
PaginatedListMissing,
17-
18-
#[error("The link map failed to deserialize: {0}")]
1913
Link(String),
2014
}
15+
16+
impl std::fmt::Display for Error {
17+
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
18+
match self {
19+
Error::PaginatedInner => {
20+
f.write_str("An item within the inner paginated structure failed to deserialize")
21+
}
22+
Error::PaginatedListMissing => {
23+
f.write_str("The inner list of paginated elements is missing")
24+
}
25+
Error::Link(inner) => write!(f, "The link map failed to deserialize: {inner}"),
26+
}
27+
}
28+
}
29+
30+
impl core::error::Error for Error {}

src/status.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ mod tests {
8383
use super::*;
8484

8585
#[test]
86-
#[cfg(feature = "serde")]
8786
fn deserialize() {
8887
let json_value = r#"{
8988
"site": {

src/task.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@ mod tests {
235235
use super::*;
236236

237237
#[test]
238-
#[cfg(feature = "serde")]
239238
fn task_status_event() {
240239
let json = r#"
241240
{
@@ -267,7 +266,6 @@ mod tests {
267266
}
268267

269268
#[test]
270-
#[cfg(feature = "serde")]
271269
fn task_status_event_float_timestamp() {
272270
use time::macros::datetime;
273271

0 commit comments

Comments
 (0)