several unrelated cleanups

rust-osdev · Nov 12, 2022 · e406329 · e406329
1 parent 3a42bd1
commit e406329
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,15 @@
 [package]
 name = "uefi"
 version = "0.17.0"
-authors = ["Gabriel Majeri <gabriel.majeri6@gmail.com>"]
+authors = [
+    "The Rust OSDev team",
+    "Hadrien G <knights_of_ni@gmx.com>",
+    "Gabriel Majeri <gabriel.majeri6@gmail.com>",
+    "Nicholas Bishop <nbishop@nbishop.net>",
+    "Philipp Schuster <phip1611@gmail.com>",
+    "Supdrewin <supdrewin@outlook.com>",
+    "Tim Roberts <tim@timroberts.dev>",
+]
 readme = "README.md"
 edition = "2021"
 exclude = [
@@ -29,8 +37,8 @@ logger = []
 panic-on-logger-errors = []
 
 [dependencies]
+log = { workspace = true }
 bitflags = "1.3.1"
-log = { version = "0.4.5", default-features = false }
 ucs2 = "0.3.2"
 uefi-macros = "0.8.0"
 
@@ -43,6 +51,9 @@ members = [
     "xtask",
 ]
 
+[workspace.dependencies]
+log = { version = "0.4", default-features = false }
+
 [patch.crates-io]
 uefi-macros = { path = "uefi-macros" }
 uefi-services = { path = "uefi-services" }

diff --git a/uefi-macros/Cargo.toml b/uefi-macros/Cargo.toml
@@ -1,7 +1,10 @@
 [package]
 name = "uefi-macros"
 version = "0.8.1"
-authors = ["Hadrien G. <knights_of_ni@gmx.com>"]
+authors = [
+    "The Rust OSDev team",
+    "Hadrien G. <knights_of_ni@gmx.com>"
+]
 readme = "README.md"
 edition = "2021"
 description = "Procedural macros for the uefi-rs crate"
@@ -11,7 +14,6 @@ categories = ["embedded", "no-std", "api-bindings"]
 license = "MPL-2.0"
 
 [badges]
-travis-ci = { repository = "rust-osdev/uefi-rs" }
 is-it-maintained-issue-resolution = { repository = "rust-osdev/uefi-rs" }
 is-it-maintained-open-issues = { repository = "rust-osdev/uefi-rs" }
 

diff --git a/uefi-services/Cargo.toml b/uefi-services/Cargo.toml
@@ -8,9 +8,9 @@ repository = "https://github.com/rust-osdev/uefi-rs"
 keywords = ["uefi", "efi"]
 categories = ["embedded", "no-std", "api-bindings"]
 license = "MPL-2.0"
+readme = "README.md"
 
 [badges]
-travis-ci = { repository = "rust-osdev/uefi-rs" }
 is-it-maintained-issue-resolution = { repository = "rust-osdev/uefi-rs" }
 is-it-maintained-open-issues = { repository = "rust-osdev/uefi-rs" }
 

diff --git a/uefi-services/README.md b/uefi-services/README.md
@@ -0,0 +1,11 @@
+# uefi-services
+
+[![Crates.io](https://img.shields.io/crates/v/uefi-services)](https://crates.io/crates/uefi-services)
+[![Docs.rs](https://docs.rs/uefi-macros/badge.svg)](https://docs.rs/uefi-services)
+
+This crate enables you some convenience features on top of the
+[`uefi`](https://crates.io/crates/uefi) crate. It includes a panic handler, a logger, and
+a global allocator.
+
+`uefi-services` is part of the `uefi-rs` project. Please refer to
+<https://github.com/rust-osdev/uefi-rs/> for comprehensive documentation.
diff --git a/uefi-test-runner/Cargo.toml b/uefi-test-runner/Cargo.toml
@@ -1,15 +1,18 @@
 [package]
 name = "uefi-test-runner"
 version = "0.2.0"
-authors = ["Gabriel Majeri <gabriel.majeri6@gmail.com>"]
+authors = [
+    "The Rust OSDev team",
+    "Gabriel Majeri <gabriel.majeri6@gmail.com>"
+]
 publish = false
 edition = "2021"
 
 [dependencies]
 uefi = { path = "..", features = ['exts'] }
 uefi-services = { path = "../uefi-services" }
 
-log = { version = "0.4.11", default-features = false }
+log = { workspace = true }
 
 qemu-exit = "3.0.0"
 

diff --git a/uefi-test-runner/src/main.rs b/uefi-test-runner/src/main.rs
@@ -98,7 +98,7 @@ fn check_screenshot(bt: &BootServices, name: &str) {
             .open_protocol_exclusive::<Serial>(serial_handle)
             .expect("Could not open serial protocol");
 
-        // Set a large timeout to avoid problems with Travis
+        // Set a large timeout to avoid problems with CI
         let mut io_mode = *serial.io_mode();
         io_mode.timeout = 10_000_000;
         serial