diff --git a/Cargo.lock b/Cargo.lock index ebe2a530a2..d1cc15975e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -220,9 +220,9 @@ dependencies = [ [[package]] name = "generic-array" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -230,9 +230,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" +checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" dependencies = [ "cfg-if", "libc", @@ -262,9 +262,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "libc" -version = "0.2.140" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "log" @@ -329,9 +329,9 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "proc-macro2" -version = "1.0.54" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -394,9 +394,9 @@ dependencies = [ [[package]] name = "redox_simple_endian" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e4404b4e54e59e7bb5f5236b61d8e822c2a77b2e955be8072002ff7ff8d69c" +checksum = "175b27da3d5db1502bd20ae0917ba132d256a2b169f1686681304ebb86504eab" [[package]] name = "redox_syscall" @@ -418,7 +418,7 @@ dependencies = [ [[package]] name = "redoxfs" -version = "0.5.6" +version = "0.5.7" dependencies = [ "aes", "argon2", diff --git a/Cargo.toml b/Cargo.toml index fe436022a9..03363eb865 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "redoxfs" description = "The Redox Filesystem" repository = "https://gitlab.redox-os.org/redox-os/redoxfs" -version = "0.5.6" +version = "0.5.7" license-file = "LICENSE" readme = "README.md" authors = ["Jeremy Soller "] @@ -46,7 +46,7 @@ uuid = { version = "0.5", default-features = false } # https://github.com/rexlunae/simple-endian-rs/pull/5 [dependencies.redox_simple_endian] -version = "0.2.1" +version = "0.3.0" default-features = false features = [ "bitwise", "comparisons", "format", "math_ops", "neg_ops", "shift_ops", diff --git a/src/allocator.rs b/src/allocator.rs index 46de902122..c3a35421e6 100644 --- a/src/allocator.rs +++ b/src/allocator.rs @@ -1,6 +1,6 @@ use alloc::vec::Vec; use core::{fmt, mem, ops, slice}; -use redox_simple_endian::*; +use simple_endian::*; use crate::BlockPtr; diff --git a/src/bin/mount.rs b/src/bin/mount.rs index ef09553d25..62abb6122a 100644 --- a/src/bin/mount.rs +++ b/src/bin/mount.rs @@ -1,5 +1,3 @@ -#![cfg_attr(not(target_os = "redox"), feature(libc))] - #[cfg(not(target_os = "redox"))] extern crate libc; diff --git a/src/block.rs b/src/block.rs index c5a30dd7f0..bc1fabb068 100644 --- a/src/block.rs +++ b/src/block.rs @@ -1,5 +1,5 @@ use core::{fmt, marker::PhantomData, mem, ops, slice}; -use redox_simple_endian::*; +use simple_endian::*; use crate::BLOCK_SIZE; diff --git a/src/header.rs b/src/header.rs index 186928e6fb..652c686ca4 100644 --- a/src/header.rs +++ b/src/header.rs @@ -1,6 +1,6 @@ use core::ops::{Deref, DerefMut}; use core::{fmt, mem, slice}; -use redox_simple_endian::*; +use simple_endian::*; use aes::{Aes128, BlockDecrypt, BlockEncrypt}; use uuid::Uuid; diff --git a/src/node.rs b/src/node.rs index 50aa98f2ad..30c382c2e8 100644 --- a/src/node.rs +++ b/src/node.rs @@ -1,5 +1,5 @@ use core::{fmt, mem, ops, slice}; -use redox_simple_endian::*; +use simple_endian::*; use crate::{BlockList, BlockPtr, BlockRaw}; diff --git a/src/tree.rs b/src/tree.rs index 6d24126c5c..8148c93c8b 100644 --- a/src/tree.rs +++ b/src/tree.rs @@ -1,5 +1,5 @@ use core::{marker::PhantomData, mem, ops, slice}; -use redox_simple_endian::*; +use simple_endian::*; use crate::{BlockPtr, BlockRaw};