Merge branch 'scheme-update' into 'master'

Update for latest redox-scheme

See merge request redox-os/ptyd!13

Cargo.lock

@@ -49,9 +49,9 @@ dependencies = [
 
 [[package]]
 name = "redox-scheme"
-version = "0.2.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95624e20d2c1808f7ca0820720d30aad9f5d2fc404e1ef379431ad7a790c3f7e"
+checksum = "63e7f06e1b19d8143043e959fbd7b76a37e759e3e9c6bbfc9c91c496b0b44d20"
 dependencies = [
  "libredox",
  "redox_syscall",
@@ -69,9 +69,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.7"
+version = "0.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
+checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
 dependencies = [
  "bitflags",
 ]

Cargo.toml

@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-libredox = "0.1.2"
+libredox = "0.1.3"
 redox-daemon = "0.1.2"
-redox-scheme = "0.2.0"
+redox-scheme = "0.3.0"
 redox_event = "0.4.0"
 redox_syscall = "0.5.0"
 redox_termios = "0.1.3"

src/main.rs

@@ -113,7 +113,7 @@ fn scan_requests(
                 }
             }
             RequestKind::Call(request) => {
-                if let Some(response) = request.handle_scheme_block_mut(scheme) {
+                if let Some(response) = request.handle_scheme_block(scheme) {
                     let _ = socket
                         .write_response(response, SignalBehavior::Restart)
                         .expect("pty: failed to write responses to pty scheme");
@@ -130,7 +130,7 @@ fn scan_requests(
 fn do_todos(socket: &Socket, scheme: &mut PtyScheme, todo: &mut Vec<Todo>) {
     let mut i = 0;
     while i < todo.len() {
-        if let Some(response) = todo[i].request.handle_scheme_block_mut(scheme) {
+        if let Some(response) = todo[i].request.handle_scheme_block(scheme) {
             todo.remove(i);
             socket
                 .write_response(response, SignalBehavior::Restart)

src/scheme.rs

@@ -3,7 +3,7 @@ use std::collections::BTreeMap;
 use std::rc::Rc;
 use std::str;
 
-use redox_scheme::SchemeBlockMut;
+use redox_scheme::SchemeBlock;
 use syscall::data::Stat;
 use syscall::error::{Error, Result, EBADF, EINVAL, ENOENT};
 use syscall::flag::{EventFlags, MODE_CHR};
@@ -30,7 +30,7 @@ impl PtyScheme {
     }
 }
 
-impl SchemeBlockMut for PtyScheme {
+impl SchemeBlock for PtyScheme {
     fn open(&mut self, path: &str, flags: usize, _uid: u32, _gid: u32) -> Result<Option<usize>> {
         let path = path.trim_matches('/');