Fix for newer nightly

Author: jackpot51

src/fs.rs

@@ -114,7 +114,7 @@ impl Dir {
 pub fn find(path: &str) -> Result<(usize, File)> {
     let wpath = wstr(path);
 
-    for (i, mut fs) in FileSystem::all().iter_mut().enumerate() {
+    for (i, fs) in FileSystem::all().iter_mut().enumerate() {
         let mut root = fs.root()?;
         match root.open(&wpath) {
             Ok(file) => {

src/lib.rs

@@ -1,10 +1,17 @@
 #![no_std]
-#![feature(alloc)]
+#![feature(asm)]
+#![feature(concat_idents)]
 #![feature(core_intrinsics)]
+#![feature(custom_test_frameworks)]
+#![feature(format_args_nl)]
+#![feature(global_asm)]
 #![feature(lang_items)]
+#![feature(log_syntax)]
 #![feature(prelude_import)]
 #![feature(raw)]
 #![feature(slice_concat_ext)]
+#![feature(test)]
+#![feature(trace_macros)]
 
 /* This section was addapted from the Rust Standard Library, and is licensed accordingly
  * https://github.com/rust-lang/rust/blob/master/src/libstd/lib.rs
@@ -17,10 +24,6 @@
 #[allow(unused)]
 use prelude::*;
 
-// Re-export a few macros from core
-pub use core::{assert_eq, assert_ne, debug_assert, debug_assert_eq, debug_assert_ne};
-pub use core::{unreachable, unimplemented, write, writeln, r#try};
-
 #[allow(unused_imports)]
 #[macro_use]
 extern crate alloc as alloc_crate;
@@ -67,14 +70,59 @@ pub use alloc_crate::borrow;
 pub use alloc_crate::fmt;
 pub use alloc_crate::format;
 pub use core::pin;
-pub use alloc_crate::collections;
 pub use alloc_crate::slice;
 pub use alloc_crate::str;
 pub use alloc_crate::string;
 pub use alloc_crate::vec;
 pub use core::char;
 pub use core::u128;
 pub use core::hint;
+pub use core::array;
+
+// Re-export macros defined in libcore.
+#[allow(deprecated, deprecated_in_future)]
+pub use core::{
+    // Stable
+    assert_eq,
+    assert_ne,
+    debug_assert_eq,
+    debug_assert_ne,
+    debug_assert,
+    r#try,
+    unimplemented,
+    unreachable,
+    write,
+    writeln,
+    // Unstable
+    todo,
+};
+
+// Re-export built-in macros defined through libcore.
+pub use core::prelude::v1::{
+    // Stable
+    assert,
+    cfg,
+    column,
+    compile_error,
+    concat,
+    env,
+    file,
+    format_args,
+    include,
+    include_bytes,
+    include_str,
+    line,
+    module_path,
+    option_env,
+    stringify,
+    // Unstable
+    asm,
+    concat_idents,
+    format_args_nl,
+    global_asm,
+    log_syntax,
+    trace_macros,
+};
 
 /* } */
 

src/prelude.rs

@@ -3,50 +3,89 @@
  * {
  */
 
-// Re-exported core operators
-#[doc(no_inline)]
-pub use crate::marker::{Copy, Send, Sized, Sync, Unpin};
-#[doc(no_inline)]
-pub use crate::ops::{Drop, Fn, FnMut, FnOnce};
-
-// Re-exported functions
-#[doc(no_inline)]
-pub use crate::mem::drop;
-
-// Re-exported types and traits
-#[doc(no_inline)]
-pub use crate::clone::Clone;
-#[doc(no_inline)]
-pub use crate::cmp::{PartialEq, PartialOrd, Eq, Ord};
-#[doc(no_inline)]
-pub use crate::convert::{AsRef, AsMut, Into, From};
-#[doc(no_inline)]
-pub use crate::default::Default;
-#[doc(no_inline)]
-pub use crate::iter::{Iterator, Extend, IntoIterator};
-#[doc(no_inline)]
-pub use crate::iter::{DoubleEndedIterator, ExactSizeIterator};
-#[doc(no_inline)]
-pub use crate::option::Option::{self, Some, None};
-#[doc(no_inline)]
-pub use crate::result::Result::{self, Ok, Err};
-
-
-// The file so far is equivalent to src/libcore/prelude/v1.rs,
-// and below to src/liballoc/prelude.rs.
-// Those files are duplicated rather than using glob imports
-// because we want docs to show these re-exports as pointing to within `std`.
-
-
-#[doc(no_inline)]
-pub use crate::boxed::Box;
-#[doc(no_inline)]
-pub use crate::borrow::ToOwned;
-#[doc(no_inline)]
-pub use crate::slice::SliceConcatExt;
-#[doc(no_inline)]
-pub use crate::string::{String, ToString};
-#[doc(no_inline)]
-pub use crate::vec::Vec;
+ // Re-exported core operators
+ #[doc(no_inline)]
+ pub use crate::marker::{Send, Sized, Sync, Unpin};
+ #[doc(no_inline)]
+ pub use crate::ops::{Drop, Fn, FnMut, FnOnce};
+
+ // Re-exported functions
+ #[doc(no_inline)]
+ pub use crate::mem::drop;
+
+ // Re-exported types and traits
+ #[doc(no_inline)]
+ pub use crate::convert::{AsRef, AsMut, Into, From};
+ #[doc(no_inline)]
+ pub use crate::iter::{Iterator, Extend, IntoIterator};
+ #[doc(no_inline)]
+ pub use crate::iter::{DoubleEndedIterator, ExactSizeIterator};
+ #[doc(no_inline)]
+ pub use crate::option::Option::{self, Some, None};
+ #[doc(no_inline)]
+ pub use crate::result::Result::{self, Ok, Err};
+
+ // Re-exported built-in macros
+ #[doc(no_inline)]
+ pub use core::prelude::v1::{
+     asm,
+     assert,
+     cfg,
+     column,
+     compile_error,
+     concat,
+     concat_idents,
+     env,
+     file,
+     format_args,
+     format_args_nl,
+     global_asm,
+     include,
+     include_bytes,
+     include_str,
+     line,
+     log_syntax,
+     module_path,
+     option_env,
+     stringify,
+     trace_macros,
+ };
+
+ // FIXME: Attribute and derive macros are not documented because for them rustdoc generates
+ // dead links which fail link checker testing.
+ #[allow(deprecated)]
+ #[doc(hidden)]
+ pub use core::prelude::v1::{
+     Clone,
+     Copy,
+     Debug,
+     Default,
+     Eq,
+     Hash,
+     Ord,
+     PartialEq,
+     PartialOrd,
+     RustcDecodable,
+     RustcEncodable,
+     bench,
+     global_allocator,
+     test,
+     test_case,
+ };
+
+ // The file so far is equivalent to src/libcore/prelude/v1.rs,
+ // and below to src/liballoc/prelude.rs.
+ // Those files are duplicated rather than using glob imports
+ // because we want docs to show these re-exports as pointing to within `std`.
+
+
+ #[doc(no_inline)]
+ pub use crate::boxed::Box;
+ #[doc(no_inline)]
+ pub use crate::borrow::ToOwned;
+ #[doc(no_inline)]
+ pub use crate::string::{String, ToString};
+ #[doc(no_inline)]
+ pub use crate::vec::Vec;
 
 /* } */