Skip to content

Commit f5b295c

Browse files
committed
post rebase fixes
1 parent d6c5e2e commit f5b295c

File tree

3 files changed

+45
-4
lines changed

3 files changed

+45
-4
lines changed

common/http-api-common/src/response/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ pub mod bincode;
1414
pub mod json;
1515
pub mod yaml;
1616

17+
pub use bincode::Bincode;
1718
pub use json::Json;
1819
pub use yaml::Yaml;
1920

20-
pub use bincode::Bincode;
21-
2221
#[derive(Debug, Clone, Default)]
2322
pub(crate) struct ResponseWrapper<T> {
2423
data: T,
@@ -71,7 +70,6 @@ impl<T> FormattedResponse<T> {
7170
match self {
7271
FormattedResponse::Json(inner) => FormattedResponse::Json(inner.map(op)),
7372
FormattedResponse::Yaml(inner) => FormattedResponse::Yaml(inner.map(op)),
74-
#[cfg(feature = "bincode")]
7573
FormattedResponse::Bincode(inner) => FormattedResponse::Bincode(inner.map(op)),
7674
}
7775
}

nym-api/enter_db.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/sh
2-
sqlite3 -init settings.sql /Users/jedrzej/workspace/nym/target/debug/build/nym-api-c386c70ee22514b7/out/nym-api-example.sqlite
2+
sqlite3 -init settings.sql /Users/jedrzej/workspace/nym/target/debug/build/nym-api-4f01f56c8e0188a3/out/nym-api-example.sqlite

nym-wallet/Cargo.lock

Lines changed: 43 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)