Browse Source

api: Remove some build warnings, muts and vars

environments/review-gnome-3-30-cou7an/deployments/18
Daniel García Moreno 8 years ago
parent
commit
801245df96
  1. 4
      fractal-matrix-api/src/backend/room.rs
  2. 1
      fractal-matrix-api/src/backend/sync.rs

4
fractal-matrix-api/src/backend/room.rs

@ -106,7 +106,7 @@ pub fn get_room_members(bk: &Backend, roomid: String) -> Result<(), Error> {
get!(&url,
|r: JsonValue| {
let joined = r["joined"].as_object().unwrap();
let mut ms: Vec<Member> = joined.iter().map(|(mxid, member_data)| {
let ms: Vec<Member> = joined.iter().map(|(mxid, member_data)| {
let alias = &member_data["display_name"];
let avatar = &member_data["avatar_url"];
@ -471,7 +471,7 @@ pub fn direct_chat(bk: &Backend, user: Member, internal_id: String) -> Result<()
r.direct = true;
tx.send(BKResponse::NewRoom(r, internal_id)).unwrap();
let mut directs = &mut data.lock().unwrap().m_direct;
let directs = &mut data.lock().unwrap().m_direct;
if directs.contains_key(&m.uid) {
directs.get_mut(&m.uid).map(|v| v.push(id.clone()));
} else {

1
fractal-matrix-api/src/backend/sync.rs

@ -65,7 +65,6 @@ pub fn sync(bk: &Backend) -> Result<(), Error> {
Ok(r) => {
let next_batch = String::from(r["next_batch"].as_str().unwrap_or(""));
if since.is_empty() {
let m_direct = parse_m_direct(&r);
data.lock().unwrap().m_direct = parse_m_direct(&r);
let rooms = match get_rooms_from_json(&r, &userid, &baseu) {

Loading…
Cancel
Save