From d025c3e26e14bd0d67a1661285d467cdb9477774 Mon Sep 17 00:00:00 2001
From: Isaiah Inuwa <isaiah.inuwa@gmail.com>
Date: Tue, 24 Dec 2019 10:12:45 -0500
Subject: [PATCH] Make style and naming convention for devices endpoint
 consistent.

---
 CHANGELOG.md                                                | 2 +-
 src/r0/device.rs                                            | 4 ++--
 src/r0/device/{bulk_delete_devices.rs => delete_devices.rs} | 4 ++--
 src/r0/device/get_devices.rs                                | 2 +-
 src/r0/device/{set_device.rs => update_device.rs}           | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename src/r0/device/{bulk_delete_devices.rs => delete_devices.rs} (93%)
 rename src/r0/device/{set_device.rs => update_device.rs} (95%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa76aac7..190392f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,4 +19,4 @@ Improvements:
 * Add `contains_url` to `r0::filter::RoomEventFilter` (introduced upstream in r0.3.0)
 * Update `r0::account::change_password` from r0.3.0 to r0.6.0
   * Add optional `auth` field
-* Add `r0::device` endpoint 
+* Add `r0::device` endpoints
diff --git a/src/r0/device.rs b/src/r0/device.rs
index 09164d45..11c27344 100644
--- a/src/r0/device.rs
+++ b/src/r0/device.rs
@@ -4,11 +4,11 @@ use js_int::UInt;
 use ruma_identifiers::DeviceId;
 use serde::{Deserialize, Serialize};
 
-pub mod bulk_delete_devices;
 pub mod delete_device;
+pub mod delete_devices;
 pub mod get_device;
 pub mod get_devices;
-pub mod set_device;
+pub mod update_device;
 
 /// Information about a registered device.
 #[derive(Clone, Debug, Deserialize, Hash, PartialEq, Serialize)]
diff --git a/src/r0/device/bulk_delete_devices.rs b/src/r0/device/delete_devices.rs
similarity index 93%
rename from src/r0/device/bulk_delete_devices.rs
rename to src/r0/device/delete_devices.rs
index 1d849142..2adf8ea5 100644
--- a/src/r0/device/bulk_delete_devices.rs
+++ b/src/r0/device/delete_devices.rs
@@ -9,7 +9,7 @@ ruma_api! {
         description: "Delete specified devices.",
         method: POST,
         path: "/_matrix/client/r0/delete_devices",
-        name: "bulk_delete_devices",
+        name: "delete_devices",
         rate_limited: false,
         requires_authentication: true,
     }
@@ -23,5 +23,5 @@ ruma_api! {
         auth: Option<AuthenticationData>,
     }
 
-    response { }
+    response {}
 }
diff --git a/src/r0/device/get_devices.rs b/src/r0/device/get_devices.rs
index 57bb9510..4419d369 100644
--- a/src/r0/device/get_devices.rs
+++ b/src/r0/device/get_devices.rs
@@ -16,6 +16,6 @@ ruma_api! {
     request {}
 
     response {
-        devices: Vec<Device>
+        devices: Vec<Device>,
     }
 }
diff --git a/src/r0/device/set_device.rs b/src/r0/device/update_device.rs
similarity index 95%
rename from src/r0/device/set_device.rs
rename to src/r0/device/update_device.rs
index e6a304c3..2d3db701 100644
--- a/src/r0/device/set_device.rs
+++ b/src/r0/device/update_device.rs
@@ -7,7 +7,7 @@ ruma_api! {
     metadata {
         description: "Update metadata for a device.",
         method: PUT,
-        name: "set_device",
+        name: "update_device",
         path: "/_matrix/client/r0/devices/:device_id",
         rate_limited: false,
         requires_authentication: true,