Merge pull request #105 from rust-osdev/alloc-2021-edition

Fix: The `alloc` crate uses the Rust 2021 edition now
rust-osdev · Jun 21, 2022 · 6432959 · 6432959
2 parents f6ce1e5 + 3a70441
commit 6432959
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/src/cargo.rs b/src/cargo.rs
@@ -123,7 +123,8 @@ fn flags(config: Option<&Config>, target: &str, tool: &str) -> Result<Vec<String
                     Err(anyhow!(
                         ".cargo/config: target.{}.{} must be an \
                          array of strings",
-                        target, tool
+                        target,
+                        tool
                     ))?
                 }
             } else {

diff --git a/src/flock.rs b/src/flock.rs
@@ -52,7 +52,10 @@ pub struct Filesystem {
 
 impl Filesystem {
     pub fn new(path: PathBuf, quiet: bool) -> Filesystem {
-        Filesystem { path: path, quiet: quiet }
+        Filesystem {
+            path: path,
+            quiet: quiet,
+        }
     }
 
     pub fn join<T>(&self, other: T) -> Filesystem
@@ -111,7 +114,9 @@ impl Filesystem {
                 })?;
             }
             State::Shared => {
-                acquire(msg, &path, self.quiet, &|| try_lock_shared(&f), &|| lock_shared(&f))?;
+                acquire(msg, &path, self.quiet, &|| try_lock_shared(&f), &|| {
+                    lock_shared(&f)
+                })?;
             }
         }
 
@@ -183,11 +188,7 @@ fn acquire(
     }
 
     if !quiet {
-        eprintln!(
-            "{:>12} waiting for file lock on {}",
-            "Blocking",
-            msg
-        )
+        eprintln!("{:>12} waiting for file lock on {}", "Blocking", msg)
     }
 
     lock_block()

diff --git a/src/rustc.rs b/src/rustc.rs
@@ -73,8 +73,10 @@ impl Sysroot {
             });
         }
 
-        Err(anyhow!("`rust-src` component not found. Run `rustup component add \
-             rust-src`."))
+        Err(anyhow!(
+            "`rust-src` component not found. Run `rustup component add \
+             rust-src`."
+        ))
     }
 }
 

diff --git a/src/sysroot.rs b/src/sysroot.rs
@@ -93,12 +93,14 @@ fn build_crate(
             td_lockfile.display()
         )
     })?;
-    let mut perms = fs::metadata(&td_lockfile).with_context(|| {
-        format!(
-            "failed to retrieve permissions for `{}`",
-            td_lockfile.display()
-        )
-    })?.permissions();
+    let mut perms = fs::metadata(&td_lockfile)
+        .with_context(|| {
+            format!(
+                "failed to retrieve permissions for `{}`",
+                td_lockfile.display()
+            )
+        })?
+        .permissions();
     perms.set_readonly(false);
     fs::set_permissions(&td_lockfile, perms).with_context(|| {
         format!(
@@ -177,7 +179,7 @@ fn build_liballoc(
 authors = ["The Rust Project Developers"]
 name = "alloc"
 version = "0.0.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies.compiler_builtins]
 version = "0.1.0"
@@ -192,10 +194,7 @@ version = "0.1.0"
     }
 
     stoml.push_str("[dependencies.core]\n");
-    stoml.push_str(&format!(
-        "path = '{}'\n",
-        src.path().join("core").display()
-    ));
+    stoml.push_str(&format!("path = '{}'\n", src.path().join("core").display()));
 
     if config.panic_immediate_abort {
         stoml.push_str("features = ['panic_immediate_abort']\n");

diff --git a/src/util.rs b/src/util.rs
@@ -3,7 +3,7 @@ use std::fs::File;
 use std::io::{Read, Write};
 use std::path::Path;
 
-use anyhow::{anyhow, Result, Context};
+use anyhow::{anyhow, Context, Result};
 use toml::Value;
 use walkdir::WalkDir;