Skip to content

Commit

Permalink
chore(Deps,snapshot): Upgrade serde 0.8.23->1.0.103
Browse files Browse the repository at this point in the history
Upgrade serde-yaml 0.5.1 -> 0.8.11
  • Loading branch information
brianp committed Dec 13, 2019
1 parent ea87a67 commit 46f1e87
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 117 deletions.
116 changes: 16 additions & 100 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ publish = false
[dependencies]
dirs = "2.0.2"
rand = "0.7.2"
serde = { version = "1", features = ["derive"] }
serde = { version = "1.0.103", features = ["derive"] }
5 changes: 2 additions & 3 deletions snapshot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ doctest = false
[dependencies]
common = { path = "../common" }
regex = "1.3.1"
serde = "0.8.18"
serde_derive = "0.8.18"
serde_yaml = "0.5"
serde = { version = "1.0.103", features = ["derive"] }
serde_yaml = "0.8"
3 changes: 0 additions & 3 deletions snapshot/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ extern crate serde_yaml;
mod capture;
pub mod tmux;

#[macro_use]
extern crate serde_derive;

use common::args::Args;
use common::first_run::check_first_run;
use common::project_paths::project_paths;
Expand Down
5 changes: 2 additions & 3 deletions snapshot/src/tmux/pane/mod.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
//use std::path::PathBuf;
//use tmux::window::Window;
use capture::retrieve_capture;
use serde::ser::Serialize;
use serde::Serializer;
use serde::{Deserialize, Serialize, Serializer};
use std::io;
use std::path::PathBuf;
use std::process::{Command, Output};
Expand Down Expand Up @@ -65,7 +64,7 @@ impl Pane {
}

impl Serialize for Pane {
fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
Expand Down
1 change: 1 addition & 0 deletions snapshot/src/tmux/pane/pid.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use serde::{Deserialize, Serialize};
use std::ffi::OsStr;
use std::fmt;
use std::str::FromStr;
Expand Down
1 change: 1 addition & 0 deletions snapshot/src/tmux/pane/process.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use serde::{Deserialize, Serialize};
use std::fmt;
use std::process::Command;
use tmux::pane::pid::Pid;
Expand Down
1 change: 1 addition & 0 deletions snapshot/src/tmux/session.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use serde::{Deserialize, Serialize};
use tmux::window::Window;

#[derive(Debug, Serialize, Deserialize)]
Expand Down
13 changes: 6 additions & 7 deletions snapshot/src/tmux/window.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use capture::retrieve_capture;
use serde::ser::Serialize;
use serde::Serializer;
use serde::{Deserialize, Serialize, Serializer};
use serde::ser::SerializeMap;
use std::io;
use std::process::{Command, Output};
use tmux::pane::Pane;
Expand Down Expand Up @@ -70,7 +70,7 @@ impl Window {
}

impl Serialize for Window {
fn serialize<S>(&self, serializer: &mut S) -> Result<(), S::Error>
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: Serializer,
{
Expand All @@ -80,10 +80,9 @@ impl Serialize for Window {
panes: self.panes.clone(),
};

let mut state = serializer.serialize_map(Some(1))?;
serializer.serialize_map_key(&mut state, &self.name)?;
serializer.serialize_map_value(&mut state, window)?;
serializer.serialize_map_end(state)
let mut map = serializer.serialize_map(Some(1))?;
map.serialize_entry(&self.name, &window)?;
map.end()
}
}

Expand Down

0 comments on commit 46f1e87

Please sign in to comment.