diff --git a/_constraints b/_constraints
index c74b3ec..7555358 100644
--- a/_constraints
+++ b/_constraints
@@ -17,9 +17,6 @@
     </conditions>
     <hardware>
       <processors>2</processors>
-      <physicalmemory>
-        <size unit="G">4</size>
-      </physicalmemory>
       <disk>
         <size unit="G">15</size>
       </disk>
diff --git a/rust-1.29.2-aarch64-unknown-linux-gnu.tar.xz b/rust-1.29.2-aarch64-unknown-linux-gnu.tar.xz
deleted file mode 100644
index 7b5e7e3..0000000
--- a/rust-1.29.2-aarch64-unknown-linux-gnu.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:63ef07abc851889ec8d0df4333b581c8767cb50f3e7c343ce08f5e96b82015a3
-size 99702524
diff --git a/rust-1.29.2-arm-unknown-linux-gnueabihf.tar.xz b/rust-1.29.2-arm-unknown-linux-gnueabihf.tar.xz
deleted file mode 100644
index 45f76b5..0000000
--- a/rust-1.29.2-arm-unknown-linux-gnueabihf.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:62712e24a785e8afcc65c07343508c2518eac7815b1f20cb9c095d47ddcf3146
-size 105657004
diff --git a/rust-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz b/rust-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz
deleted file mode 100644
index 2fa3d62..0000000
--- a/rust-1.29.2-armv7-unknown-linux-gnueabihf.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1c6bc61992a4e1fd5d098739142bad5204cfcd4f5489f87e7d972d5bd7e65ec9
-size 105958932
diff --git a/rust-1.29.2-i686-unknown-linux-gnu.tar.xz b/rust-1.29.2-i686-unknown-linux-gnu.tar.xz
deleted file mode 100644
index 0e0f71e..0000000
--- a/rust-1.29.2-i686-unknown-linux-gnu.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e9cfba714309f1f19fe9550b693d9c1f35e95ae25049851abab3af94f446510
-size 150567444
diff --git a/rust-1.29.2-powerpc64-unknown-linux-gnu.tar.xz b/rust-1.29.2-powerpc64-unknown-linux-gnu.tar.xz
deleted file mode 100644
index 91689be..0000000
--- a/rust-1.29.2-powerpc64-unknown-linux-gnu.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d6db7c98caad76015bea002e7e61bba43e1ff4fcdf76f905ad6c378e4caaac9
-size 103432092
diff --git a/rust-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz b/rust-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz
deleted file mode 100644
index fc48a95..0000000
--- a/rust-1.29.2-powerpc64le-unknown-linux-gnu.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27714e2abde3d89f5947371ec144f4386639b037aa214e5571508faff2d0c66f
-size 106607384
diff --git a/rust-1.29.2-s390x-unknown-linux-gnu.tar.xz b/rust-1.29.2-s390x-unknown-linux-gnu.tar.xz
deleted file mode 100644
index 3666bc4..0000000
--- a/rust-1.29.2-s390x-unknown-linux-gnu.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:48f1a492d12e8441549e8229ee0bddab4f3634c0a6ebeb2b10d36dc89332401a
-size 99114900
diff --git a/rust-1.29.2-x86_64-unknown-linux-gnu.tar.xz b/rust-1.29.2-x86_64-unknown-linux-gnu.tar.xz
deleted file mode 100644
index 0f5b024..0000000
--- a/rust-1.29.2-x86_64-unknown-linux-gnu.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b27b4da8e7a85c07dc546cb26682cf0fc74cb4c183dce44f9014c2dd9265931f
-size 148275708
diff --git a/rust-1.30.0-aarch64-unknown-linux-gnu.tar.xz b/rust-1.30.0-aarch64-unknown-linux-gnu.tar.xz
new file mode 100644
index 0000000..dce3e08
--- /dev/null
+++ b/rust-1.30.0-aarch64-unknown-linux-gnu.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8cd698c0772b66547c958647380006ea9d10d0c7a66920b2b69a83f61a478f11
+size 114266452
diff --git a/rust-1.30.0-arm-unknown-linux-gnueabihf.tar.xz b/rust-1.30.0-arm-unknown-linux-gnueabihf.tar.xz
new file mode 100644
index 0000000..65ec700
--- /dev/null
+++ b/rust-1.30.0-arm-unknown-linux-gnueabihf.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:008513bacf80e889bc3d8965ccde1be8f3c39eae256101ea9e47c400381e76a2
+size 121166088
diff --git a/rust-1.30.0-armv7-unknown-linux-gnueabihf.tar.xz b/rust-1.30.0-armv7-unknown-linux-gnueabihf.tar.xz
new file mode 100644
index 0000000..06abab6
--- /dev/null
+++ b/rust-1.30.0-armv7-unknown-linux-gnueabihf.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56533fbceeb3ea3c2dbad120c5eb3d362633ca51d7d0907b5349dd1af409aa0d
+size 122388404
diff --git a/rust-1.30.0-i686-unknown-linux-gnu.tar.xz b/rust-1.30.0-i686-unknown-linux-gnu.tar.xz
new file mode 100644
index 0000000..504cfc0
--- /dev/null
+++ b/rust-1.30.0-i686-unknown-linux-gnu.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:31cf9db8ec64b9db1c01415d8011e7782efdef9c2fb2e80c2f944fef5ac222a4
+size 143749252
diff --git a/rust-1.30.0-powerpc64-unknown-linux-gnu.tar.xz b/rust-1.30.0-powerpc64-unknown-linux-gnu.tar.xz
new file mode 100644
index 0000000..800df66
--- /dev/null
+++ b/rust-1.30.0-powerpc64-unknown-linux-gnu.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b924bf5de693ff98628c7cf16e571d1a5aca9b570280f964c83125c375c053c
+size 118801024
diff --git a/rust-1.30.0-powerpc64le-unknown-linux-gnu.tar.xz b/rust-1.30.0-powerpc64le-unknown-linux-gnu.tar.xz
new file mode 100644
index 0000000..3cf90d1
--- /dev/null
+++ b/rust-1.30.0-powerpc64le-unknown-linux-gnu.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:df29c9deaedee6da1c83664c2bcf7123f7a0619e2c30a9a13353bbc7cb525eb3
+size 121649488
diff --git a/rust-1.30.0-s390x-unknown-linux-gnu.tar.xz b/rust-1.30.0-s390x-unknown-linux-gnu.tar.xz
new file mode 100644
index 0000000..23298ba
--- /dev/null
+++ b/rust-1.30.0-s390x-unknown-linux-gnu.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e00e7b1130890cae075fe296798f68ffe5d9062801c47c2a96757f4f532d347d
+size 124144360
diff --git a/rust-1.30.0-x86_64-unknown-linux-gnu.tar.xz b/rust-1.30.0-x86_64-unknown-linux-gnu.tar.xz
new file mode 100644
index 0000000..88e6e11
--- /dev/null
+++ b/rust-1.30.0-x86_64-unknown-linux-gnu.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2c8c6161ca0536e3af1ca6def8b09f41bb0c0d401d805664e0e04a2d1971d588
+size 144673332
diff --git a/rust.changes b/rust.changes
index 921ab51..7ed78d4 100644
--- a/rust.changes
+++ b/rust.changes
@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Thu Dec  6 22:31:16 UTC 2018 - Luke Jones <jones_ld@protonmail.com>
+
+- Update to version 1.31.0
+  + Language
+    - This version marks the release of the 2018 edition of Rust.
+    - New lifetime elision rules now allow for eliding lifetimes in functions and
+  impl headers. E.g. `impl<'a> Reader for BufReader<'a> {}` can now be
+  `impl Reader for BufReader<'_> {}`. Lifetimes are still required to be defined
+  in structs.
+    - You can now define and use `const` functions. These are currently
+  a strict minimal subset of the const fn RFC. Refer to the
+  [language reference][const-reference] for what exactly is available.
+    - You can now use tool lints, which allow you to scope lints from external
+  tools using attributes. E.g. `#[allow(clippy::filter_map)]`.
+    - `#[no_mangle]` and `#[export_name]` attributes can now be located anywhere in
+  a crate, not just in exported functions.
+    - You can now use parentheses in pattern matches.
+  + Compiler
+    - Updated musl to 1.1.20
+  + Libraries
+    - You can now convert `num::NonZero*` types to their raw equivalvents using the
+  `From` trait. E.g. `u8` now implements `From<NonZeroU8>`.
+    - You can now convert a `&Option<T>` into `Option<&T>` and `&mut Option<T>`
+  into `Option<&mut T>` using the `From` trait.
+    - You can now multiply (`*`) a `time::Duration` by a `u32`.
+  + Stabilized APIs
+    - `slice::align_to`
+    - `slice::align_to_mut`
+    - `slice::chunks_exact`
+    - `slice::chunks_exact_mut`
+    - `slice::rchunks`
+    - `slice::rchunks_mut`
+    - `slice::rchunks_exact`
+    - `slice::rchunks_exact_mut`
+    - `Option::replace`
+  + Cargo
+    - Cargo will now download crates in parallel using HTTP/2.
+    - You can now rename packages in your Cargo.toml We have a guide
+  on how to use the `package` key in your dependencies.
+
 -------------------------------------------------------------------
 Tue Nov 13 22:56:17 UTC 2018 - Luke Jones <jones_ld@protonmail.com>
 
diff --git a/rust.spec b/rust.spec
index 5b705c3..8efb0e2 100644
--- a/rust.spec
+++ b/rust.spec
@@ -17,10 +17,10 @@
 #
 
 
-%global prev_rust 1.29.2
+%global prev_rust 1.30.0
 # some sub-packages are versioned independantly
-%global rustfmt_version 0.99.4
-%global rls_version 0.130.5
+%global rustfmt_version 1.0.0
+%global rls_version 1.31.6
 %global clippy_version 0.0.212
 # Build the rust target triple.
 # Some rust arches don't match what SUSE labels them.
@@ -56,7 +56,7 @@
 # v-1 will build v
 # %bcond_with rust_bootstrap
 # Temporarily set the bootstrap flag in the spec so rings will build without intervention
-%bcond_without rust_bootstrap
+%bcond_with rust_bootstrap
 # Distro LLVM should be sufficient, this also cuts compile times byu almost half
 %if 0%{?suse_version} <= 1315
 %bcond_without bundled_llvm
@@ -64,7 +64,7 @@
 %bcond_with bundled_llvm
 %endif
 Name:           rust
-Version:        1.30.0
+Version:        1.31.0
 Release:        0
 Summary:        A systems programming language
 License:        MIT OR Apache-2.0
@@ -519,9 +519,9 @@ rm -rf %{buildroot}%{_sysconfdir}
 
 %files -n clippy
 %if 0%{?suse_version} == 1315
-%doc src/tools/clippy/LICENSE
+%doc src/tools/clippy/LICENSE-{APACHE,MIT}
 %else
-%license src/tools/clippy/LICENSE
+%license src/tools/clippy/LICENSE-{APACHE,MIT}
 %endif
 %doc src/tools/clippy/{README.md,CHANGELOG.md}
 %{_bindir}/cargo-clippy
diff --git a/rustc-1.30.0-src.tar.xz b/rustc-1.30.0-src.tar.xz
deleted file mode 100644
index 7873095..0000000
--- a/rustc-1.30.0-src.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9fc7304fd48d6d6a23fa4565d94353c7cc2659db452f34d69fbc01c4f67021d
-size 96083280
diff --git a/rustc-1.31.0-src.tar.xz b/rustc-1.31.0-src.tar.xz
new file mode 100644
index 0000000..6a19352
--- /dev/null
+++ b/rustc-1.31.0-src.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9581c5673937f8b1c3c21060ef7c1fcd3e5574a0fc0b27e1888cb37c4b2ec393
+size 96914112