Merge pull request #2 from rust-lang/master

Update fork
beling · Apr 26, 2020 · b3b5bd0 · b3b5bd0
2 parents 9ebf59c + e37c0e8
commit b3b5bd0
Show file tree

Hide file tree

Showing 2,183 changed files with 27,717 additions and 15,503 deletions.
diff --git a/.cargo/config b/.cargo/config
@@ -0,0 +1,3 @@
+[cargo-new]
+name = "Your Name"
+email = "you@example.com"
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ dist: trusty
 language: rust
 cache: cargo
 rust:
-  - 1.31.1
+  - 1.41.0
 branches:
   only:
   - master
@@ -13,6 +13,6 @@ addons:
       - aspell
       - aspell-en
 before_script:
-  - (cargo install mdbook --vers 0.1.7 --force || true)
+  - (cargo install mdbook --vers 0.3.5 --force || true)
 script:
   - bash ci/build.sh
diff --git a/2018-edition/Cargo.lock b/2018-edition/Cargo.lock
diff --git a/2018-edition/Cargo.toml b/2018-edition/Cargo.toml