chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update serde to 1.0.

Browse Source
This commit is contained in:
Jimmy Cuadra 2017-04-21 03:53:11 -07:00
parent c80d41e076
commit dee5cc91bc
6 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Cargo.toml
View File

@ -11,8 +11,8 @@ repository = "https://github.com/ruma/ruma-events"
version = "0.7.0" version = "0.7.0"
[dependencies] [dependencies]
ruma-identifiers = "0.10" ruma-identifiers = "0.11"
ruma-signatures = "0.2" ruma-signatures = "0.3"
serde = "0.9" serde = "1.0"
serde_derive = "0.9" serde_derive = "1.0"
serde_json = "0.9" serde_json = "1.0"

12
src/collections/all.rs
View File

@ -192,8 +192,8 @@ impl Serialize for Event {
} }
} }
impl Deserialize for Event { impl<'de> Deserialize<'de> for Event {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let value: Value = try!(Deserialize::deserialize(deserializer)); let value: Value = try!(Deserialize::deserialize(deserializer));
let event_type_value = match value.get("type") { let event_type_value = match value.get("type") {
@ -439,8 +439,8 @@ impl Serialize for RoomEvent {
} }
} }
impl Deserialize for RoomEvent { impl<'de> Deserialize<'de> for RoomEvent {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let value: Value = try!(Deserialize::deserialize(deserializer)); let value: Value = try!(Deserialize::deserialize(deserializer));
let event_type_value = match value.get("type") { let event_type_value = match value.get("type") {
@ -642,8 +642,8 @@ impl Serialize for StateEvent {
} }
} }
impl Deserialize for StateEvent { impl<'de> Deserialize<'de> for StateEvent {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let value: Value = try!(Deserialize::deserialize(deserializer)); let value: Value = try!(Deserialize::deserialize(deserializer));
let event_type_value = match value.get("type") { let event_type_value = match value.get("type") {

8
src/collections/only.rs
View File

@ -65,8 +65,8 @@ impl Serialize for Event {
} }
} }
impl Deserialize for Event { impl<'de> Deserialize<'de> for Event {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let value: Value = try!(Deserialize::deserialize(deserializer)); let value: Value = try!(Deserialize::deserialize(deserializer));
let event_type_value = match value.get("type") { let event_type_value = match value.get("type") {
@ -146,8 +146,8 @@ impl Serialize for RoomEvent {
} }
} }
impl Deserialize for RoomEvent { impl<'de> Deserialize<'de> for RoomEvent {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let value: Value = try!(Deserialize::deserialize(deserializer)); let value: Value = try!(Deserialize::deserialize(deserializer));
let event_type_value = match value.get("type") { let event_type_value = match value.get("type") {

10
src/lib.rs
View File

@ -183,9 +183,9 @@ pub enum EventType {
} }
/// A basic event. /// A basic event.
pub trait Event: Debug + Deserialize + Serialize { pub trait Event where Self: Debug + for<'a> Deserialize<'a> + Serialize {
/// The event-type-specific payload this event carries. /// The event-type-specific payload this event carries.
type Content: Debug + Deserialize + Serialize; type Content: Debug + for<'a> Deserialize<'a> + Serialize;
/// The event's content. /// The event's content.
fn content(&self) -> &Self::Content; fn content(&self) -> &Self::Content;
@ -307,11 +307,11 @@ impl Serialize for EventType {
} }
} }
impl Deserialize for EventType { impl<'de> Deserialize<'de> for EventType {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
struct EventTypeVisitor; struct EventTypeVisitor;
impl Visitor for EventTypeVisitor { impl<'de> Visitor<'de> for EventTypeVisitor {
type Value = EventType; type Value = EventType;
fn expecting(&self, formatter: &mut Formatter) -> FmtResult { fn expecting(&self, formatter: &mut Formatter) -> FmtResult {

4
src/room/message.rs
View File

@ -268,8 +268,8 @@ impl Serialize for MessageEventContent {
} }
} }
impl Deserialize for MessageEventContent { impl<'de> Deserialize<'de> for MessageEventContent {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let value: Value = try!(Deserialize::deserialize(deserializer)); let value: Value = try!(Deserialize::deserialize(deserializer));
let message_type_value = match value.get("msgtype") { let message_type_value = match value.get("msgtype") {

7
src/stripped.rs
View File

@ -65,8 +65,9 @@ pub enum StrippedState {
/// A "stripped-down" version of a core state event. /// A "stripped-down" version of a core state event.
#[derive(Clone, Debug, Deserialize, Serialize)] #[derive(Clone, Debug, Deserialize, Serialize)]
pub struct StrippedStateContent<C> where C: Deserialize + Serialize { pub struct StrippedStateContent<C> where C: for<'a> Deserialize<'a> + Serialize {
/// Data specific to the event type. /// Data specific to the event type.
#[serde(bound(deserialize = ""))]
pub content: C, pub content: C,
/// The type of the event. /// The type of the event.
#[serde(rename="type")] #[serde(rename="type")]
@ -94,8 +95,8 @@ impl Serialize for StrippedState {
} }
} }
impl Deserialize for StrippedState { impl<'de> Deserialize<'de> for StrippedState {
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where D: Deserializer<'de> {
let value: Value = try!(Deserialize::deserialize(deserializer)); let value: Value = try!(Deserialize::deserialize(deserializer));
let event_type_value = match value.get("type") { let event_type_value = match value.get("type") {