This repository was archived by the owner on Apr 3, 2019. It is now read-only.
chore(deps): update versions of Rust, Rocket and Rusoto #209
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
philbooth
force-pushed
the
pb/update-deps
branch
from
ac42472 to
406f0d2
Compare
rfk
approved these changes
Oct 29, 2018
src/bin/service.rs
Outdated
| @@ -58,7 +51,7 @@ fn main() { | |||
| let config = settings | |||
| .build_rocket_config() | |||
| .expect("Error creating rocket config"); | |||
| rocket::custom(config) | |||
| rocket::custom(config, settings.log.level.0.as_str() != "off") | |||
There was a problem hiding this comment.
Is the .0 here going to conflict with you other PR where you remove the use of this .0 style?
| @@ -24,7 +24,6 @@ | |||
| //! [send]: ../fxa_email_send/index.html | |||
| //! [queues]: ../fxa_email_queues/index.html | |||
|
|
|||
| #![feature(assoc_unix_epoch)] | |||
There was a problem hiding this comment.
This feature graduated to stable at some point in the three months since we last updated the Rust version, so we no longer need to explicitly pref it on.
philbooth
force-pushed
the
pb/update-deps
branch
from
406f0d2 to
c152bc8
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #207.
We've been pinned to an ancient version of Rust for a while and I really wanted to get us updated before cutting train 124 (which is hopefully going to see some traffic). Updating Rust required updating Rocket and Rusoto, so that's done here too. Initially I wanted to do a full
cargo updatebut the build fails if you do that because of rust-lang/rust#55376. As soon as that's resolved, we should update the other deps too.Most of the code changes here are because
cargo fmt. There's also a couple of knock-on code changes from the Rocket update (the disappearance ofrocket_contrib::JsonValueand the disappearance ofrocket::LoggingLevel::Off).Because there's a bit going on, I've kept everything as separate commits. If we want to review them separately I'm happy to break this into multiple PRs. Also, as discussed in retro recently, if you want to join me in Vidyo so I can take you through the changes in more detail, I am more than happy to do that.
@mozilla/fxa-devs r?