aboutsummaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-06-04 13:51:53 -0700
committerZeyla Hellyer <[email protected]>2017-06-04 14:38:24 -0700
commitd66adb4375a2280800fd3b6484fd00da5b552789 (patch)
tree268926d39f4bcaf5fe3f1f44cc85b83781623adb /src/model
parentRemove a FQN usage in User::refresh (diff)
downloadserenity-d66adb4375a2280800fd3b6484fd00da5b552789.tar.xz
serenity-d66adb4375a2280800fd3b6484fd00da5b552789.zip
Make http::AttachmentType only use borrowed values
With the way AttachmentType is meant to be used by `http::send_files`, none of the values need to be moved, they only need to be borrowed.
Diffstat (limited to 'src/model')
-rw-r--r--src/model/channel/channel_id.rs6
-rw-r--r--src/model/channel/group.rs4
-rw-r--r--src/model/channel/guild_channel.rs4
-rw-r--r--src/model/channel/mod.rs4
-rw-r--r--src/model/channel/private_channel.rs4
5 files changed, 11 insertions, 11 deletions
diff --git a/src/model/channel/channel_id.rs b/src/model/channel/channel_id.rs
index de907b0..bb9932d 100644
--- a/src/model/channel/channel_id.rs
+++ b/src/model/channel/channel_id.rs
@@ -453,7 +453,7 @@ impl ChannelId {
/// let f1 = File::open("my_file.jpg").unwrap();
/// let f2 = File::open("my_file2.jpg").unwrap();
///
- /// let files = vec![(f1, "my_file.jpg"), (f2, "my_file2.jpg")];
+ /// let files = vec![(&f1, "my_file.jpg"), (&f2, "my_file2.jpg")];
///
/// let _ = channel_id.send_files(files, |m| m.content("a file"));
/// ```
@@ -474,8 +474,8 @@ impl ChannelId {
/// [`GuildChannel`]: struct.GuildChannel.html
/// [Attach Files]: permissions/constant.ATTACH_FILES.html
/// [Send Messages]: permissions/constant.SEND_MESSAGES.html
- pub fn send_files<F, T: Into<AttachmentType>>(&self, files: Vec<T>, f: F) -> Result<Message>
- where F: FnOnce(CreateMessage) -> CreateMessage {
+ pub fn send_files<'a, F, T>(&self, files: Vec<T>, f: F) -> Result<Message>
+ where F: FnOnce(CreateMessage) -> CreateMessage, T: Into<AttachmentType<'a>> {
let mut map = f(CreateMessage::default()).0;
if let Some(content) = map.get("content") {
diff --git a/src/model/channel/group.rs b/src/model/channel/group.rs
index ca4d48f..c1bc32a 100644
--- a/src/model/channel/group.rs
+++ b/src/model/channel/group.rs
@@ -327,8 +327,8 @@ impl Group {
/// [Attach Files]: permissions/constant.ATTACH_FILES.html
/// [Send Messages]: permissions/constant.SEND_MESSAGES.html
#[inline]
- pub fn send_files<F, T: Into<AttachmentType>>(&self, files: Vec<T>, f: F) -> Result<Message>
- where F: FnOnce(CreateMessage) -> CreateMessage {
+ pub fn send_files<'a, F, T>(&self, files: Vec<T>, f: F) -> Result<Message>
+ where F: FnOnce(CreateMessage) -> CreateMessage, T: Into<AttachmentType<'a>> {
self.channel_id.send_files(files, f)
}
diff --git a/src/model/channel/guild_channel.rs b/src/model/channel/guild_channel.rs
index f51276c..a6e90e8 100644
--- a/src/model/channel/guild_channel.rs
+++ b/src/model/channel/guild_channel.rs
@@ -587,8 +587,8 @@ impl GuildChannel {
/// [Attach Files]: permissions/constant.ATTACH_FILES.html
/// [Send Messages]: permissions/constant.SEND_MESSAGES.html
#[inline]
- pub fn send_files<F, T: Into<AttachmentType>>(&self, files: Vec<T>, f: F) -> Result<Message>
- where F: FnOnce(CreateMessage) -> CreateMessage {
+ pub fn send_files<'a, F, T>(&self, files: Vec<T>, f: F) -> Result<Message>
+ where F: FnOnce(CreateMessage) -> CreateMessage, T: Into<AttachmentType<'a>> {
self.id.send_files(files, f)
}
diff --git a/src/model/channel/mod.rs b/src/model/channel/mod.rs
index 269b702..aed04ab 100644
--- a/src/model/channel/mod.rs
+++ b/src/model/channel/mod.rs
@@ -323,8 +323,8 @@ impl Channel {
/// [Attach Files]: permissions/constant.ATTACH_FILES.html
/// [Send Messages]: permissions/constant.SEND_MESSAGES.html
#[inline]
- pub fn send_files<F, T: Into<AttachmentType>>(&self, files: Vec<T>, f: F) -> Result<Message>
- where F: FnOnce(CreateMessage) -> CreateMessage {
+ pub fn send_files<'a, F, T>(&self, files: Vec<T>, f: F) -> Result<Message>
+ where F: FnOnce(CreateMessage) -> CreateMessage, T: Into<AttachmentType<'a>> {
self.id().send_files(files, f)
}
diff --git a/src/model/channel/private_channel.rs b/src/model/channel/private_channel.rs
index ba90185..11c99ac 100644
--- a/src/model/channel/private_channel.rs
+++ b/src/model/channel/private_channel.rs
@@ -273,8 +273,8 @@ impl PrivateChannel {
/// [Attach Files]: permissions/constant.ATTACH_FILES.html
/// [Send Messages]: permissions/constant.SEND_MESSAGES.html
#[inline]
- pub fn send_files<F, T: Into<AttachmentType>>(&self, files: Vec<T>, f: F) -> Result<Message>
- where F: FnOnce(CreateMessage) -> CreateMessage {
+ pub fn send_files<'a, F, T>(&self, files: Vec<T>, f: F) -> Result<Message>
+ where F: FnOnce(CreateMessage) -> CreateMessage, T: Into<AttachmentType<'a>> {
self.id.send_files(files, f)
}