From 1cf5f5ea22e86171476bc95e853db43610865a73 Mon Sep 17 00:00:00 2001
From: 4lDO2 <4lDO2@protonmail.com>
Date: Thu, 17 Jun 2021 18:42:16 +0200
Subject: [PATCH] Update dependencies to work with latest nightly.

---
 Cargo.lock         | 29 +++++++++++++++++++----------
 Cargo.toml         |  6 +++---
 rmm                |  2 +-
 src/lib.rs         |  1 -
 src/scheme/acpi.rs | 10 +++++-----
 syscall            |  2 +-
 6 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 75d8620..d62066c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -64,7 +64,7 @@ dependencies = [
  "cc",
  "fdt",
  "goblin",
- "linked_list_allocator 0.8.11",
+ "linked_list_allocator 0.9.0",
  "log",
  "paste",
  "raw-cpuid 8.1.2",
@@ -73,7 +73,7 @@ dependencies = [
  "rustc-cfg",
  "rustc-demangle",
  "slab_allocator",
- "spin 0.5.2",
+ "spin 0.9.0",
  "x86",
 ]
 
@@ -88,18 +88,18 @@ dependencies = [
 
 [[package]]
 name = "linked_list_allocator"
-version = "0.8.11"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "822add9edb1860698b79522510da17bef885171f75aa395cff099d770c609c24"
+checksum = "d0b725207570aa16096962d0b20c79f8a543df2280bd3c903022b9b0b4d7ea68"
 dependencies = [
  "spinning_top",
 ]
 
 [[package]]
 name = "lock_api"
-version = "0.3.4"
+version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
+checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
 dependencies = [
  "scopeguard",
 ]
@@ -149,7 +149,7 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.2.8"
+version = "0.2.9"
 dependencies = [
  "bitflags",
 ]
@@ -227,10 +227,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
 [[package]]
-name = "spinning_top"
-version = "0.1.1"
+name = "spin"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "047031d6df5f5ae0092c97aa4f6bb04cfc9c081b4cd4cb9cdb38657994279a00"
+checksum = "b87bbf98cb81332a56c1ee8929845836f85e8ddd693157c30d76660196014478"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "spinning_top"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75adad84ee84b521fb2cca2d4fd0f1dab1d8d026bda3c5bea4ca63b5f9f9293c"
 dependencies = [
  "lock_api",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index c7fb591..def826d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -14,13 +14,13 @@ cc = "1.0.3"
 rustc-cfg = "0.3.0"
 
 [dependencies]
-bitfield = "0.13.1"
 bitflags = "1.2.1"
-linked_list_allocator = "0.8.4"
+bitfield = "0.13.2"
+linked_list_allocator = "0.9.0"
 log = { version = "0.4" }
 redox_syscall = { path = "syscall" }
 slab_allocator = { path = "slab_allocator", optional = true }
-spin = "0.5.2"
+spin = "0.9"
 paste = "1"
 rmm = { path = "rmm", default-features = false }
 
diff --git a/rmm b/rmm
index c81c4de..c66956c 160000
--- a/rmm
+++ b/rmm
@@ -1 +1 @@
-Subproject commit c81c4de223583b23d2f91f0978e378ef1dc3676f
+Subproject commit c66956ca2ac1b4df3904afbafe53321a4b6c50af
diff --git a/src/lib.rs b/src/lib.rs
index 9f141dd..d0cc4fd 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -47,7 +47,6 @@
 #![cfg_attr(target_arch = "aarch64", feature(llvm_asm))] // TODO: Rewrite using asm!
 #![feature(concat_idents)]
 #![feature(const_btree_new)]
-#![feature(const_fn)]
 #![feature(core_intrinsics)]
 #![feature(global_asm)]
 #![feature(integer_atomics)]
diff --git a/src/scheme/acpi.rs b/src/scheme/acpi.rs
index c56a581..41e731b 100644
--- a/src/scheme/acpi.rs
+++ b/src/scheme/acpi.rs
@@ -54,7 +54,7 @@ pub fn register_kstop() -> bool {
     *KSTOP_FLAG.lock() = true;
     let mut waiters_awoken = KSTOP_WAITCOND.notify();
 
-    if let Some(&acpi_scheme) = SCHEME_ID.r#try() {
+    if let Some(&acpi_scheme) = SCHEME_ID.get() {
         let handles = HANDLES.read();
 
         for (&fd, _) in handles.iter().filter(|(_, handle)| handle.kind == HandleKind::ShutdownPipe) {
@@ -88,7 +88,7 @@ impl AcpiScheme {
             data_init = true;
 
             let rsdt_or_xsdt = RXSDT_ENUM
-                .r#try()
+                .get()
                 .expect("expected RXSDT_ENUM to be initialized before AcpiScheme");
 
             let table = match rsdt_or_xsdt {
@@ -168,7 +168,7 @@ impl Scheme for AcpiScheme {
 
         match handle.kind {
             HandleKind::Rxsdt => {
-                let data = DATA.r#try().ok_or(Error::new(EBADFD))?;
+                let data = DATA.get().ok_or(Error::new(EBADFD))?;
 
                 stat.st_mode = MODE_FILE;
                 stat.st_size = data.len().try_into().unwrap_or(u64::max_value());
@@ -194,7 +194,7 @@ impl Scheme for AcpiScheme {
         }
 
         let file_len = match handle.kind {
-            HandleKind::Rxsdt => DATA.r#try().ok_or(Error::new(EBADFD))?.len(),
+            HandleKind::Rxsdt => DATA.get().ok_or(Error::new(EBADFD))?.len(),
             HandleKind::ShutdownPipe => 1,
             HandleKind::TopLevel => TOPLEVEL_CONTENTS.len(),
         };
@@ -251,7 +251,7 @@ impl Scheme for AcpiScheme {
                 handle.offset = 1;
                 return Ok(1);
             }
-            HandleKind::Rxsdt => DATA.r#try().ok_or(Error::new(EBADFD))?,
+            HandleKind::Rxsdt => DATA.get().ok_or(Error::new(EBADFD))?,
             HandleKind::TopLevel => TOPLEVEL_CONTENTS,
         };
 
diff --git a/syscall b/syscall
index 0b51bdd..52fcd23 160000
--- a/syscall
+++ b/syscall
@@ -1 +1 @@
-Subproject commit 0b51bddd288dac97c9c7fc04bca9f16ad3b93bd2
+Subproject commit 52fcd238db87354b6556eac9b05bb8ab2658426a