diff --git a/Cargo.lock b/Cargo.lock index a0400944fc..543e95c742 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -94,7 +94,7 @@ dependencies = [ "libc", "libredox 0.0.3", "redox-daemon", - "redox-scheme 0.5.0 (git+https://gitlab.redox-os.org/redox-os/redox-scheme.git)", + "redox-scheme 0.1.0", "redox_syscall 0.4.1", ] @@ -656,7 +656,7 @@ dependencies = [ "indexmap", "libredox 0.1.3", "redox-daemon", - "redox-scheme 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "redox-scheme 0.5.0", "redox_syscall 0.5.10", "slab", ] @@ -722,6 +722,16 @@ dependencies = [ "termion", ] +[[package]] +name = "redox-scheme" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "425289b64797f9b7d98971e61d4838c67041c2ca13511e5a62539936873ae1a8" +dependencies = [ + "libredox 0.0.3", + "redox_syscall 0.4.1", +] + [[package]] name = "redox-scheme" version = "0.2.4" @@ -752,15 +762,6 @@ dependencies = [ "redox_syscall 0.5.10", ] -[[package]] -name = "redox-scheme" -version = "0.5.0" -source = "git+https://gitlab.redox-os.org/redox-os/redox-scheme.git#84bcf5dc27d0aa823f24a199c25b583cded48ee6" -dependencies = [ - "libredox 0.1.3", - "redox_syscall 0.5.10", -] - [[package]] name = "redox_event" version = "0.4.1" diff --git a/audiod/Cargo.toml b/audiod/Cargo.toml index 800f9af732..94f7a21b01 100644 --- a/audiod/Cargo.toml +++ b/audiod/Cargo.toml @@ -9,4 +9,4 @@ redox-daemon = "0.1.2" redox_syscall = "0.4.1" libc = "0.2" libredox = "0.0.3" -redox-scheme = { git = "https://gitlab.redox-os.org/redox-os/redox-scheme.git" } +redox-scheme = "0.1.0" diff --git a/audiod/src/main.rs b/audiod/src/main.rs index e0599ae021..66c63692e4 100644 --- a/audiod/src/main.rs +++ b/audiod/src/main.rs @@ -66,7 +66,7 @@ fn daemon(daemon: Daemon) -> Result<()> { libredox::call::setrens(0, 0)?; // The scheme is now ready to accept requests, notify the original process - daemon.ready()?; + daemon.ready().unwrap(); let mut pending = Vec::new();