Switch to 2018 edition

Most of this was generated by the absolutely extraordinary `cargo fix`
subcommand. There were still 2 errors and a few warnings to patch up,
but compared to the normal 600+ errors, I'd say the fixer did a damn
good job! I'm also amazed that I could still start the VM after this,
I half expected some kinds of runtime failure...
This commit is contained in:
jD91mZM2
2019-06-21 11:09:32 +02:00
parent 1be77c2ab4
commit fe705d9b63
73 changed files with 374 additions and 368 deletions
+2 -2
View File
@@ -2,8 +2,8 @@ use alloc::string::String;
use alloc::vec::Vec;
use core::str;
use context;
use syscall::error::Result;
use crate::context;
use crate::syscall::error::Result;
pub fn resource() -> Result<Vec<u8>> {
let mut string = format!("{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<6}{:<8}{}\n",
+3 -3
View File
@@ -1,10 +1,10 @@
use alloc::vec::Vec;
use device::cpu::cpu_info;
use syscall::error::{Error, EIO, Result};
use crate::device::cpu::cpu_info;
use crate::syscall::error::{Error, EIO, Result};
pub fn resource() -> Result<Vec<u8>> {
let mut string = format!("CPUs: {}\n", ::cpu_count());
let mut string = format!("CPUs: {}\n", crate::cpu_count());
match cpu_info(&mut string) {
Ok(()) => Ok(string.into_bytes()),
+2 -2
View File
@@ -1,7 +1,7 @@
use alloc::vec::Vec;
use context;
use syscall::error::{Error, ESRCH, Result};
use crate::context;
use crate::syscall::error::{Error, ESRCH, Result};
pub fn resource() -> Result<Vec<u8>> {
let mut name = {
+3 -3
View File
@@ -3,9 +3,9 @@ use alloc::vec::Vec;
use core::fmt::Write;
use core::str;
use context;
use scheme;
use syscall::error::Result;
use crate::context;
use crate::scheme;
use crate::syscall::error::Result;
pub fn resource() -> Result<Vec<u8>> {
let mut string = String::new();
+2 -2
View File
@@ -1,7 +1,7 @@
use alloc::vec::Vec;
use log::LOG;
use syscall::error::Result;
use crate::log::LOG;
use crate::syscall::error::Result;
pub fn resource() -> Result<Vec<u8>> {
let mut vec = Vec::new();
+4 -4
View File
@@ -5,10 +5,10 @@ use core::{cmp, str};
use core::sync::atomic::{AtomicUsize, Ordering};
use spin::RwLock;
use syscall::data::Stat;
use syscall::error::{Error, EBADF, EINVAL, ENOENT, Result};
use syscall::flag::{MODE_DIR, MODE_FILE, SEEK_CUR, SEEK_END, SEEK_SET};
use syscall::scheme::Scheme;
use crate::syscall::data::Stat;
use crate::syscall::error::{Error, EBADF, EINVAL, ENOENT, Result};
use crate::syscall::flag::{MODE_DIR, MODE_FILE, SEEK_CUR, SEEK_END, SEEK_SET};
use crate::syscall::scheme::Scheme;
mod context;
mod cpu;
+3 -3
View File
@@ -1,8 +1,8 @@
use alloc::vec::Vec;
use context;
use scheme;
use syscall::error::{Error, ESRCH, Result};
use crate::context;
use crate::scheme;
use crate::syscall::error::{Error, ESRCH, Result};
pub fn resource() -> Result<Vec<u8>> {
let scheme_ns = {
+3 -3
View File
@@ -1,8 +1,8 @@
use alloc::vec::Vec;
use context;
use scheme;
use syscall::error::{Error, ESRCH, Result};
use crate::context;
use crate::scheme;
use crate::syscall::error::{Error, ESRCH, Result};
pub fn resource() -> Result<Vec<u8>> {
let scheme_ns = {
+3 -3
View File
@@ -3,9 +3,9 @@ use alloc::vec::Vec;
use core::fmt::Write;
use core::str;
use context;
use syscall;
use syscall::error::Result;
use crate::context;
use crate::syscall;
use crate::syscall::error::Result;
pub fn resource() -> Result<Vec<u8>> {
let mut string = String::new();
+1 -1
View File
@@ -1,5 +1,5 @@
use alloc::vec::Vec;
use syscall::error::Result;
use crate::syscall::error::Result;
pub fn resource() -> Result<Vec<u8>> {
Ok(format!("Redox\n\n{}\n\n{}\n",