Upgrade plume dependencies (#332)

* Bump base64 from 0.9.3 to 0.10.0
* Bump bcrypt from 0.2.0 to 0.2.1
* Bump canapi from 0.1.0 to 0.2.0
* Bump failure from 0.1.2 to 0.1.3
* Bump hyper from 0.11.27 to 0.12.11
* Bump hyper from 0.11.27 to 0.12.16
* Bump lazy_static from 1.1.0 to 1.2.0
* Bump multipart from 0.15.3 to 0.15.4
* Bump openssl from 0.10.12 to 0.10.15
* Bump pulldown-cmark from 0.1.2 to 0.2.0
* Bump reqwest from 0.9.2 to 0.9.5
* Bump rocket from 0.4.0-rc.1 to 0.4.0
* Bump rpassword from 2.0.0 to 2.1.0
* Bump ructe from 0.5.2 to 0.5.4
* Bump serde_derive from 1.0.79 to 1.0.80
* Bump serde from 1.0.79 to 1.0.80
* Bump serde_json from 1.0.32 to 1.0.33
* Bump tera from 0.11.17 to 0.11.20
* Bump url from 1.7.1 to 1.7.2
* Bump validator to from 0.7.2 to 0.8.0
* Bump validator_derive from 0.7.2 to 0.8.0
* Bump whatlang from 0.5.0 to 0.6.0
* Remove hyper from plume-common dependencies
* Remove rpassword from Plume dependancies
* Upgrade compiler to nightly-2018-12-06
This commit is contained in:
fdb-hiroshima 2018-12-07 21:00:12 +01:00 committed by GitHub
parent b4e4b497ee
commit e1ecc7289f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 488 additions and 366 deletions

View File

@ -1,6 +1,6 @@
language: rust language: rust
rust: rust:
- nightly-2018-10-06 - nightly-2018-12-06
cache: cache:
cargo: true cargo: true
directories: directories:

804
Cargo.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -7,15 +7,15 @@ version = "0.2.0"
activitypub = "0.1.3" activitypub = "0.1.3"
askama_escape = "0.1" askama_escape = "0.1"
atom_syndication = "0.6" atom_syndication = "0.6"
canapi = "0.1" canapi = "0.2"
colored = "1.6" colored = "1.6"
dotenv = "0.13" dotenv = "0.13"
failure = "0.1" failure = "0.1"
guid-create = "0.1" guid-create = "0.1"
heck = "0.3.0" heck = "0.3.0"
num_cpus = "1.0" num_cpus = "1.0"
rocket = "0.4.0-rc.1" rocket = "0.4.0"
rocket_contrib = { version = "0.4.0-rc.1", features = ["json"] } rocket_contrib = { version = "0.4.0", features = ["json"] }
rocket_i18n = "0.3.1" rocket_i18n = "0.3.1"
rpassword = "2.0" rpassword = "2.0"
scheduled-thread-pool = "0.2.0" scheduled-thread-pool = "0.2.0"
@ -24,7 +24,7 @@ serde_derive = "1.0"
serde_json = "1.0" serde_json = "1.0"
serde_qs = "0.4" serde_qs = "0.4"
validator = "0.8" validator = "0.8"
validator_derive = "0.7" validator_derive = "0.8"
webfinger = "0.3.1" webfinger = "0.3.1"
[[bin]] [[bin]]
@ -62,7 +62,7 @@ git = "https://github.com/fdb-hiroshima/rocket_csrf"
rev = "717fad53cfd2ee5cbee5b4571f6190644f9dddd7" rev = "717fad53cfd2ee5cbee5b4571f6190644f9dddd7"
[build-dependencies] [build-dependencies]
ructe = "0.5.2" ructe = "0.5.4"
rocket_i18n = { version = "0.3.1", features = ["build"] } rocket_i18n = { version = "0.3.1", features = ["build"] }
[features] [features]

View File

@ -4,6 +4,6 @@ version = "0.1.0"
authors = ["Bat' <baptiste@gelez.xyz>"] authors = ["Bat' <baptiste@gelez.xyz>"]
[dependencies] [dependencies]
canapi = "0.1" canapi = "0.2"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"

View File

@ -10,7 +10,7 @@ path = "src/main.rs"
[dependencies] [dependencies]
clap = "2.32" clap = "2.32"
dotenv = "0.13" dotenv = "0.13"
rpassword = "2.0" rpassword = "2.1"
[dependencies.diesel] [dependencies.diesel]
features = ["r2d2", "chrono"] features = ["r2d2", "chrono"]

View File

@ -8,14 +8,14 @@ activitypub = "0.1.1"
activitystreams-derive = "0.1.0" activitystreams-derive = "0.1.0"
activitystreams-traits = "0.1.0" activitystreams-traits = "0.1.0"
array_tool = "1.0" array_tool = "1.0"
base64 = "0.9" base64 = "0.10"
failure = "0.1" failure = "0.1"
failure_derive = "0.1" failure_derive = "0.1"
heck = "0.3.0" heck = "0.3.0"
hex = "0.3" hex = "0.3"
hyper = "0.11.27" hyper = "0.12.16"
openssl = "0.10.11" openssl = "0.10.15"
rocket = "0.4.0-rc.1" rocket = "0.4.0"
reqwest = "0.9" reqwest = "0.9"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
@ -27,4 +27,4 @@ version = "0.4"
[dependencies.pulldown-cmark] [dependencies.pulldown-cmark]
default-features = false default-features = false
version = "0.1.2" version = "0.2.0"

View File

@ -12,7 +12,6 @@ extern crate failure;
extern crate failure_derive; extern crate failure_derive;
extern crate hex; extern crate hex;
extern crate heck; extern crate heck;
extern crate hyper;
extern crate openssl; extern crate openssl;
extern crate pulldown_cmark; extern crate pulldown_cmark;
extern crate reqwest; extern crate reqwest;

View File

@ -8,13 +8,13 @@ activitypub = "0.1.1"
ammonia = "1.2.0" ammonia = "1.2.0"
askama_escape = "0.1" askama_escape = "0.1"
bcrypt = "0.2" bcrypt = "0.2"
canapi = "0.1" canapi = "0.2"
guid-create = "0.1" guid-create = "0.1"
heck = "0.3.0" heck = "0.3.0"
itertools = "0.7.8" itertools = "0.7.8"
lazy_static = "*" lazy_static = "*"
openssl = "0.10.11" openssl = "0.10.15"
rocket = "0.4.0-rc.1" rocket = "0.4.0"
reqwest = "0.9" reqwest = "0.9"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
@ -22,7 +22,7 @@ serde_json = "1.0"
tantivy = "0.7.1" tantivy = "0.7.1"
url = "1.7" url = "1.7"
webfinger = "0.3.1" webfinger = "0.3.1"
whatlang = "0.5.0" whatlang = "0.6.0"
[dependencies.chrono] [dependencies.chrono]
features = ["serde"] features = ["serde"]

View File

@ -1 +1 @@
nightly-2018-10-06 nightly-2018-12-06

View File

@ -23,7 +23,6 @@ extern crate rocket_contrib;
extern crate rocket_csrf; extern crate rocket_csrf;
#[macro_use] #[macro_use]
extern crate rocket_i18n; extern crate rocket_i18n;
extern crate rpassword;
extern crate scheduled_thread_pool; extern crate scheduled_thread_pool;
extern crate serde; extern crate serde;
#[macro_use] #[macro_use]

View File

@ -120,7 +120,7 @@ pub fn create(conn: DbConn, form: LenientForm<NewBlogForm>, user: User, intl: I1
Ok(Redirect::to(uri!(details: name = slug.clone()))) Ok(Redirect::to(uri!(details: name = slug.clone())))
} else { } else {
Err(render!(blogs::new( Err(render!(blogs::new(
&(&*conn, &intl.catalog, Some(user)), &(&*conn, &intl.catalog, Some(user)),
&*form, &*form,
errors errors

View File

@ -145,7 +145,7 @@ pub fn update_settings(conn: DbConn, admin: Admin, form: LenientForm<InstanceSet
form.long_description.clone()); form.long_description.clone());
Redirect::to(uri!(admin)) Redirect::to(uri!(admin))
}) })
.map_err(|e| { .map_err(|e| {
let local_inst = Instance::get_local(&*conn).expect("instance::update_settings: local instance not found"); let local_inst = Instance::get_local(&*conn).expect("instance::update_settings: local instance not found");
render!(instance::admin( render!(instance::admin(
&(&*conn, &intl.catalog, Some(admin.0)), &(&*conn, &intl.catalog, Some(admin.0)),

View File

@ -262,7 +262,7 @@ pub fn update(blog: String, slug: String, user: User, conn: DbConn, form: Lenien
} }
} else { } else {
let medias = Media::for_user(&*conn, user.id); let medias = Media::for_user(&*conn, user.id);
let temp = render!(posts::new( let temp = render!(posts::new(
&(&*conn, &intl.catalog, Some(user)), &(&*conn, &intl.catalog, Some(user)),
b, b,
true, true,
@ -382,7 +382,7 @@ pub fn create(blog_name: String, form: LenientForm<NewPostForm>, user: User, con
} }
} else { } else {
let medias = Media::for_user(&*conn, user.id); let medias = Media::for_user(&*conn, user.id);
Err(Some(render!(posts::new( Err(Some(render!(posts::new(
&(&*conn, &intl.catalog, Some(user)), &(&*conn, &intl.catalog, Some(user)),
blog, blog,
false, false,

View File

@ -83,7 +83,7 @@ pub fn create(conn: DbConn, form: LenientForm<LoginForm>, flash: Option<FlashMes
let uri = Uri::parse(&destination) let uri = Uri::parse(&destination)
.map(|x| x.into_owned()) .map(|x| x.into_owned())
.map_err(|_| render!(session::login( .map_err(|_| render!(session::login(
&(&*conn, &intl.catalog, None), &(&*conn, &intl.catalog, None),
None, None,
&*form, &*form,

View File

@ -333,7 +333,7 @@ pub fn create(conn: DbConn, form: LenientForm<NewUserForm>, intl: I18n) -> Resul
).update_boxes(&*conn); ).update_boxes(&*conn);
Redirect::to(uri!(super::session::new)) Redirect::to(uri!(super::session::new))
}) })
.map_err(|err| { .map_err(|err| {
render!(users::new( render!(users::new(
&(&*conn, &intl.catalog, None), &(&*conn, &intl.catalog, None),
Instance::get_local(&*conn).map(|i| i.open_registrations).unwrap_or(true), Instance::get_local(&*conn).map(|i| i.open_registrations).unwrap_or(true),