vv/fractal
1
0
Fork 0
Code Pull requests Projects Releases Packages Activity

fractal-matrix-api: Drop redundant closures

Browse source 
Fixing clippy error:

```
error: redundant closure found
   --> fractal-matrix-api/src/util.rs:219:60
    |
219 |         r.prev_batch = timeline["prev_batch"].as_str().map(|s| String::from(s));
    |                                                            ^^^^^^^^^^^^^^^^^^^ help: remove closure as shown: `String::from`
    |
    = note: `-D clippy::redundant-closure` implied by `-D warnings`
    = help: for further information visit https://rust-lang-nursery.github.io/rust-clippy/master/index.html#redundant_closure
```

Related: #370
This commit is contained in:
Zeeshan Ali 2018-12-10 17:15:41 +01:00 committed by Alexandre Franke
parent 14e7d2fcf5
commit 4d34eed4ab
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fractal-matrix-api/src/backend/room.rs
View file

@ -140,7 +140,7 @@ pub fn get_room_messages(bk: &Backend, roomid: String, from: String) -> Result<(
let array = r["chunk"].as_array(); let array = r["chunk"].as_array();
let evs = array.unwrap().iter().rev(); let evs = array.unwrap().iter().rev();
let list = Message::from_json_events_iter(roomid.clone(), evs); let list = Message::from_json_events_iter(roomid.clone(), evs);
let prev_batch = r["end"].as_str().map(|s| String::from(s)); let prev_batch = r["end"].as_str().map(String::from);
tx.send(BKResponse::RoomMessagesTo(list, roomid, prev_batch)) tx.send(BKResponse::RoomMessagesTo(list, roomid, prev_batch))
.unwrap(); .unwrap();
}, },

4
fractal-matrix-api/src/model/message.rs
View file

@ -152,8 +152,8 @@ impl Message {
fn parse_m_room_message(msg: &mut Message, c: &JsonValue) { fn parse_m_room_message(msg: &mut Message, c: &JsonValue) {
let mtype = c["msgtype"].as_str().unwrap_or(""); let mtype = c["msgtype"].as_str().unwrap_or("");
let body = c["body"].as_str().unwrap_or(""); let body = c["body"].as_str().unwrap_or("");
let formatted_body = c["formatted_body"].as_str().map(|s| String::from(s)); let formatted_body = c["formatted_body"].as_str().map(String::from);
let format = c["format"].as_str().map(|s| String::from(s)); let format = c["format"].as_str().map(String::from);
match mtype { match mtype {
"m.image" | "m.file" | "m.video" | "m.audio" => { "m.image" | "m.file" | "m.video" | "m.audio" => {

2
fractal-matrix-api/src/util.rs
View file

@ -216,7 +216,7 @@ pub fn get_rooms_from_json(r: &JsonValue, userid: &str, baseu: &Url) -> Result<V
.as_i64() .as_i64()
.unwrap_or(0) as i32; .unwrap_or(0) as i32;
r.prev_batch = timeline["prev_batch"].as_str().map(|s| String::from(s)); r.prev_batch = timeline["prev_batch"].as_str().map(String::from);
if let Some(ev) = dataevs.as_array() { if let Some(ev) = dataevs.as_array() {
for tag in ev.iter().filter(|x| x["type"] == "m.tag") { for tag in ev.iter().filter(|x| x["type"] == "m.tag") {