aboutsummaryrefslogtreecommitdiff
path: root/src/http
diff options
context:
space:
mode:
authoracdenisSK <[email protected]>2017-10-02 22:29:10 +0200
committeracdenisSK <[email protected]>2017-10-02 22:29:10 +0200
commit6a4e52b3fac7d2e96e3a1a67901fbdd4721fb249 (patch)
treeae9ad7d7cb73d4ece6a199796af5975545071493 /src/http
parent`to_owned` -> `to_string` (diff)
downloadserenity-6a4e52b3fac7d2e96e3a1a67901fbdd4721fb249.tar.xz
serenity-6a4e52b3fac7d2e96e3a1a67901fbdd4721fb249.zip
Use the de-generification trick.
Fixes #168
Diffstat (limited to 'src/http')
-rw-r--r--src/http/mod.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/http/mod.rs b/src/http/mod.rs
index 4f70dcf..f7a71ee 100644
--- a/src/http/mod.rs
+++ b/src/http/mod.rs
@@ -1613,6 +1613,10 @@ pub fn remove_group_recipient(group_id: u64, user_id: u64) -> Result<()> {
/// [`HttpError::InvalidRequest`]: enum.HttpError.html#variant.InvalidRequest
pub fn send_files<'a, T>(channel_id: u64, files: Vec<T>, map: JsonMap) -> Result<Message>
where T: Into<AttachmentType<'a>> {
+ _send_files(channel_id, files.into_iter().map(|a| a.into()).collect(), map)
+}
+
+fn _send_files<'a>(channel_id: u64, files: Vec<AttachmentType<'a>>, map: JsonMap) -> Result<Message> {
let uri = format!(api!("/channels/{}/messages"), channel_id);
let url = match Url::parse(&uri) {
Ok(url) => url,
@@ -1633,7 +1637,7 @@ pub fn send_files<'a, T>(channel_id: u64, files: Vec<T>, map: JsonMap) -> Result
let mut file_num = "0".to_string();
for file in files {
- match file.into() {
+ match file {
AttachmentType::Bytes((mut bytes, filename)) => {
request
.write_stream(&file_num, &mut bytes, Some(filename), None)?;