remove calculate in docs, fix unused imports

master
Devin R 2020-04-02 18:22:52 -04:00
parent 187734f449
commit a96286a5ff
3 changed files with 4 additions and 5 deletions

View File

@ -20,7 +20,7 @@ use std::sync::atomic::{AtomicU64, Ordering};
use std::sync::Arc; use std::sync::Arc;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
use futures::future::{BoxFuture, Future, FutureExt}; use futures::future::Future;
use tokio::sync::RwLock; use tokio::sync::RwLock;
use tokio::time::delay_for as sleep; use tokio::time::delay_for as sleep;
use tracing::{debug, info, instrument, trace}; use tracing::{debug, info, instrument, trace};

View File

@ -14,7 +14,6 @@
// limitations under the License. // limitations under the License.
use std::collections::{HashMap, HashSet}; use std::collections::{HashMap, HashSet};
use std::convert::TryFrom;
use std::fmt; use std::fmt;
use std::sync::Arc; use std::sync::Arc;
@ -30,7 +29,7 @@ use crate::events::collections::only::Event as NonRoomEvent;
use crate::events::ignored_user_list::IgnoredUserListEvent; use crate::events::ignored_user_list::IgnoredUserListEvent;
use crate::events::push_rules::{PushRulesEvent, Ruleset}; use crate::events::push_rules::{PushRulesEvent, Ruleset};
use crate::events::EventResult; use crate::events::EventResult;
use crate::identifiers::{RoomAliasId, UserId as Uid}; use crate::identifiers::RoomAliasId;
use crate::models::Room; use crate::models::Room;
use crate::session::Session; use crate::session::Session;
use crate::EventEmitter; use crate::EventEmitter;

View File

@ -140,7 +140,7 @@ impl Room {
} }
} }
/// Calculate and return the display name of the room. /// Return the display name of the room.
pub fn calculate_name(&self) -> String { pub fn calculate_name(&self) -> String {
self.room_name.calculate_name(&self.room_id, &self.members) self.room_name.calculate_name(&self.room_id, &self.members)
} }
@ -237,7 +237,7 @@ impl Room {
} }
} }
fn handle_encryption_event(&mut self, event: &EncryptionEvent) -> bool { fn handle_encryption_event(&mut self, _event: &EncryptionEvent) -> bool {
self.encrypted = true; self.encrypted = true;
true true
} }