Skip to content

Commit e06281b

Browse files
authored
chore: clippy cleanup in bindings (#545)
1 parent 8587efd commit e06281b

File tree

4 files changed

+21
-25
lines changed

4 files changed

+21
-25
lines changed

bindings_ffi/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::process::Command;
33
fn main() {
44
uniffi::generate_scaffolding("./src/xmtpv3.udl").expect("Building the UDL file failed");
55
Command::new("make")
6-
.args(&["libxmtp-version"])
6+
.args(["libxmtp-version"])
77
.status()
88
.expect("failed to make libxmtp-version");
99
}

bindings_ffi/src/logger.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ impl log::Log for RustLogger {
2020
self.logger.lock().expect("Logger mutex is poisoned!").log(
2121
record.level() as u32,
2222
record.level().to_string(),
23-
format!("[libxmtp] {}", record.args().to_string()),
23+
format!("[libxmtp] {}", record.args()),
2424
);
2525
}
2626
}

bindings_ffi/src/v2.rs

+12-16
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,11 @@ impl From<FfiV2QueryRequest> for QueryRequest {
167167
start_time_ns: req.start_time_ns,
168168
end_time_ns: req.end_time_ns,
169169
paging_info: req.paging_info.map(|paging_info| {
170-
return PagingInfo {
170+
PagingInfo {
171171
limit: paging_info.limit,
172172
direction: paging_info.direction as i32,
173173
cursor: paging_info.cursor.map(|c| c.into()), // TODO: fix me
174-
};
174+
}
175175
}),
176176
}
177177
}
@@ -183,12 +183,10 @@ impl From<QueryRequest> for FfiV2QueryRequest {
183183
content_topics: req.content_topics,
184184
start_time_ns: req.start_time_ns,
185185
end_time_ns: req.end_time_ns,
186-
paging_info: req.paging_info.map(|paging_info| {
187-
return FfiPagingInfo {
188-
limit: paging_info.limit,
189-
direction: FfiSortDirection::from_i32(paging_info.direction),
190-
cursor: proto_cursor_to_ffi(paging_info.cursor),
191-
};
186+
paging_info: req.paging_info.map(|paging_info| FfiPagingInfo {
187+
limit: paging_info.limit,
188+
direction: FfiSortDirection::from_i32(paging_info.direction),
189+
cursor: proto_cursor_to_ffi(paging_info.cursor),
192190
}),
193191
}
194192
}
@@ -204,12 +202,10 @@ impl From<QueryResponse> for FfiV2QueryResponse {
204202
fn from(resp: QueryResponse) -> Self {
205203
Self {
206204
envelopes: resp.envelopes.into_iter().map(|env| env.into()).collect(),
207-
paging_info: resp.paging_info.map(|paging_info| {
208-
return FfiPagingInfo {
209-
limit: paging_info.limit,
210-
direction: FfiSortDirection::from_i32(paging_info.direction),
211-
cursor: None,
212-
};
205+
paging_info: resp.paging_info.map(|paging_info| FfiPagingInfo {
206+
limit: paging_info.limit,
207+
direction: FfiSortDirection::from_i32(paging_info.direction),
208+
cursor: None,
213209
}),
214210
}
215211
}
@@ -220,11 +216,11 @@ impl From<FfiV2QueryResponse> for QueryResponse {
220216
Self {
221217
envelopes: resp.envelopes.into_iter().map(|env| env.into()).collect(),
222218
paging_info: resp.paging_info.map(|paging_info| {
223-
return PagingInfo {
219+
PagingInfo {
224220
limit: paging_info.limit,
225221
direction: paging_info.direction as i32,
226222
cursor: None, // TODO: fix me
227-
};
223+
}
228224
}),
229225
}
230226
}

bindings_flutter/src/libxmtp_api.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ impl Client {
121121
created_at_ns: group.created_at_ns,
122122
})
123123
.collect();
124-
return Ok(groups);
124+
Ok(groups)
125125
}
126126

127127
pub async fn create_group(&self, account_addresses: Vec<String>) -> Result<Group, XmtpError> {
@@ -131,10 +131,10 @@ impl Client {
131131
group.add_members(account_addresses).await?;
132132
}
133133
self.inner.sync_welcomes().await?;
134-
return Ok(Group {
134+
Ok(Group {
135135
group_id: group.group_id,
136136
created_at_ns: group.created_at_ns,
137-
});
137+
})
138138
}
139139

140140
pub async fn list_members(&self, group_id: Vec<u8>) -> Result<Vec<GroupMember>, XmtpError> {
@@ -223,9 +223,9 @@ pub struct SignatureRequiredClient {
223223
impl SignatureRequiredClient {
224224
pub async fn sign(&self, signature: Vec<u8>) -> Result<Client, XmtpError> {
225225
self.inner.register_identity(Some(signature)).await?;
226-
return Ok(Client {
226+
Ok(Client {
227227
inner: self.inner.clone(),
228-
});
228+
})
229229
}
230230
}
231231

@@ -259,10 +259,10 @@ pub async fn create_client(
259259
if text_to_sign.is_none() {
260260
return Ok(CreatedClient::Ready(Client { inner }));
261261
}
262-
return Ok(CreatedClient::RequiresSignature(SignatureRequiredClient {
262+
Ok(CreatedClient::RequiresSignature(SignatureRequiredClient {
263263
text_to_sign: text_to_sign.unwrap(),
264264
inner,
265-
}));
265+
}))
266266
}
267267

268268
#[cfg(test)]

0 commit comments

Comments
 (0)