Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/matrix-sdk-ui/src/timeline/tests/polls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ async fn test_votes_after_end_are_discarded() {
// Alice votes but it's too late, her vote won't count
timeline.send_poll_response(&ALICE, vec!["id_up"], &poll_id).await;
let results = timeline.poll_state().await.results();
for (_, votes) in results.votes.iter() {
for votes in results.votes.values() {
assert!(votes.is_empty());
}
}
Expand Down
4 changes: 3 additions & 1 deletion crates/matrix-sdk/src/room/knock_requests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

use std::slice;

use js_int::UInt;
use ruma::{EventId, OwnedEventId, OwnedMxcUri, OwnedUserId, RoomId};

Expand Down Expand Up @@ -56,7 +58,7 @@ impl KnockRequest {
/// Marks the knock request as 'seen' so the client can ignore it in the
/// future.
pub async fn mark_as_seen(&self) -> Result<(), Error> {
self.room.mark_knock_requests_as_seen(&[self.member_info.user_id.to_owned()]).await?;
self.room.mark_knock_requests_as_seen(slice::from_ref(&self.member_info.user_id)).await?;
Ok(())
}

Expand Down
2 changes: 1 addition & 1 deletion crates/matrix-sdk/src/room/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1815,7 +1815,7 @@ impl Room {
}
}
} else {
for (_, list) in content.iter_mut() {
for list in content.values_mut() {
list.retain(|room_id| *room_id != this_room_id);
}

Expand Down
Loading