From 7db4b2d6ddb9295dbce2ff56aaa6635008409237 Mon Sep 17 00:00:00 2001
From: Meltinglava <roi1996@gmail.com>
Date: Tue, 10 Mar 2020 14:05:14 +0100
Subject: [PATCH] set edition to 2018 and make sure travis has rustfmt

---
 .travis.yml  | 2 ++
 rustfmt.toml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a96bb0812..89bc7d33c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 language: rust
+before_script:
+- rustup component add rustfmt
 sudo: false
 matrix:
   include:
diff --git a/rustfmt.toml b/rustfmt.toml
index d83d4c133..b44719ae2 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -43,7 +43,7 @@ trailing_comma = "Vertical"
 match_block_trailing_comma = false
 blank_lines_upper_bound = 1
 blank_lines_lower_bound = 0
-edition = "2015"
+edition = "2018"
 version = "One"
 inline_attribute_width = 0
 merge_derives = true