Merge branch 'main' into 'main'

Fix typos across 3 drivers

See merge request redox-os/base!246
This commit is contained in:
Jeremy Soller
2026-04-27 12:27:11 -06:00
3 changed files with 7 additions and 7 deletions
+3 -3
View File
@@ -482,11 +482,11 @@ fn main() {
}
fn daemon_runner(daemon: daemon::Daemon, pcid_handle: PciFunctionHandle) -> ! {
deamon(daemon, pcid_handle).unwrap();
daemon(daemon, pcid_handle).unwrap();
unreachable!();
}
fn deamon(deamon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> anyhow::Result<()> {
fn daemon(daemon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> anyhow::Result<()> {
common::setup_logging(
"graphics",
"pci",
@@ -540,7 +540,7 @@ fn deamon(deamon: daemon::Daemon, mut pcid_handle: PciFunctionHandle) -> anyhow:
device.transport.clone(),
has_edid,
)?;
deamon.ready();
daemon.ready();
user_data! {
enum Source {
+2 -2
View File
@@ -521,7 +521,7 @@ impl SchemeSync for InputScheme {
}
}
fn deamon(daemon: daemon::SchemeDaemon) -> anyhow::Result<()> {
fn daemon(daemon: daemon::SchemeDaemon) -> anyhow::Result<()> {
// Create the ":input" scheme.
let socket_file = Socket::create()?;
let mut scheme = InputScheme::new();
@@ -589,7 +589,7 @@ fn deamon(daemon: daemon::SchemeDaemon) -> anyhow::Result<()> {
}
fn daemon_runner(daemon: daemon::SchemeDaemon) -> ! {
deamon(daemon).unwrap();
daemon(daemon).unwrap();
unreachable!();
}
+2 -2
View File
@@ -31,11 +31,11 @@ fn main() {
}
fn daemon_runner(daemon: daemon::Daemon, pcid_handle: PciFunctionHandle) -> ! {
deamon(daemon, pcid_handle).unwrap();
daemon(daemon, pcid_handle).unwrap();
unreachable!();
}
fn deamon(
fn daemon(
daemon: daemon::Daemon,
mut pcid_handle: PciFunctionHandle,
) -> Result<(), Box<dyn std::error::Error>> {