aboutsummaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
authorMishio595 <[email protected]>2018-08-06 20:15:11 -0600
committerMishio595 <[email protected]>2018-08-06 20:15:11 -0600
commitd910405d8f50fb381b7d9430b76f0b38ef4c9458 (patch)
tree1d09b965cf0447cce84384196e19c1eba562ef7c /src/model
parentMerge branch 'upstream' (diff)
parentDereference a destructure instead (diff)
downloadserenity-d910405d8f50fb381b7d9430b76f0b38ef4c9458.tar.xz
serenity-d910405d8f50fb381b7d9430b76f0b38ef4c9458.zip
Merge branch 'upstream'
Diffstat (limited to 'src/model')
-rw-r--r--src/model/gateway.rs12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/model/gateway.rs b/src/model/gateway.rs
index 9af4a7e..989cff8 100644
--- a/src/model/gateway.rs
+++ b/src/model/gateway.rs
@@ -133,13 +133,21 @@ impl Game {
impl<'a> From<&'a str> for Game {
fn from(name: &'a str) -> Self {
- Game::playing(name)
+ Game {
+ kind: GameType::Playing,
+ name: name.to_owned(),
+ url: None,
+ }
}
}
impl From<String> for Game {
fn from(name: String) -> Self {
- Game::playing(&name)
+ Game {
+ kind: GameType::Playing,
+ url: None,
+ name,
+ }
}
}