rust updates

- no need to declare feature io/path anymore
- change range(start,end) to (start..end)
- deprecated warnings remain for FileType & PosixPath, used by rust-fuse

src/inode.rs

@@ -11,6 +11,7 @@ use libc;
 use libc::consts::os::posix88;
 use std::collections::hash_map;
 use std::old_io::FileType;
+use std::old_path::PosixPath;
 
 use blob;
 use tree;
@@ -33,7 +34,7 @@ pub enum Id {
 /// A generic interface for different Git object types to implement.
 pub trait Inode: Send {
     /// Find a directory entry in this Inode by name.
-    fn lookup(&mut self, _repo: &git2::Repository, _name: &Path
+    fn lookup(&mut self, _repo: &git2::Repository, _name: &PosixPath
              ) -> Result<Id, libc::c_int> {
         Err(posix88::ENOTDIR)
     }
@@ -62,7 +63,7 @@ pub trait Inode: Send {
 
     /// Read directory entries from this Inode.
     fn readdir<'a>(&'a mut self, _repo: &git2::Repository, _offset: u64,
-               _add: Box<FnMut(Id, FileType, &Path) -> bool + 'a>
+               _add: Box<FnMut(Id, FileType, &PosixPath) -> bool + 'a>
               ) -> Result<(), libc::c_int> {
         Err(posix88::ENOTDIR)
     }

src/lib.rs

@@ -10,11 +10,9 @@
 
 #![feature(asm)]
 #![feature(core)]
-#![feature(io)]
 #![feature(libc)]
 #![feature(old_io)]
 #![feature(old_path)]
-#![feature(path)]
 #![feature(std_misc)]
 
 #![deny(missing_docs)]

src/main.rs

@@ -16,7 +16,6 @@
 //!
 //! - MOUNTPOINT: The target to mount the filesystem.  Defaults to GIT_DIR/fs.
 
-#![feature(path)]
 #![feature(std_misc)]
 
 extern crate gitfs;

src/reference.rs

@@ -12,14 +12,15 @@ use libc::consts::os::posix88;
 use std::collections::hash_map;
 use std::default::Default;
 use std::old_io::{FileType, USER_DIR};
+use std::old_path::PosixPath;
 
 use inode;
 
 
 /// Represents a virtual directory in reference paths
 /// (e.g. `refs/heads/master` needs intermediate `refs/` and `refs/heads/`)
 pub struct RefDir {
-    entries: hash_map::HashMap<Path, inode::Id>,
+    entries: hash_map::HashMap<PosixPath, inode::Id>,
 }
 
 impl RefDir {
@@ -31,7 +32,7 @@ impl RefDir {
 }
 
 impl inode::Inode for RefDir {
-    fn lookup(&mut self, _repo: &git2::Repository, name: &Path
+    fn lookup(&mut self, _repo: &git2::Repository, name: &PosixPath
               ) -> Result<inode::Id, libc::c_int> {
         self.entries.get(name).cloned().ok_or(posix88::ENOENT)
     }
@@ -49,7 +50,7 @@ impl inode::Inode for RefDir {
     }
 
     fn readdir<'a>(&mut self, _repo: &git2::Repository, offset: u64,
-               mut add: Box<FnMut(inode::Id, FileType, &Path) -> bool + 'a>
+               mut add: Box<FnMut(inode::Id, FileType, &PosixPath) -> bool + 'a>
               ) -> Result<(), libc::c_int> {
         if offset < self.entries.len() as u64 {
             for (path, &id) in self.entries.iter().skip(offset as usize) {

src/root.rs

@@ -10,6 +10,7 @@ use git2;
 use libc;
 use libc::consts::os::posix88;
 use std::old_io::{FileType, USER_DIR};
+use std::old_path::PosixPath;
 
 use inode;
 use inode::{FileAttr, Id, Inode};
@@ -30,7 +31,7 @@ impl Root {
 }
 
 impl Inode for Root {
-    fn lookup(&mut self, repo: &git2::Repository, name: &Path
+    fn lookup(&mut self, repo: &git2::Repository, name: &PosixPath
              ) -> Result<Id, libc::c_int> {
         if name.as_vec() == b"HEAD" {
             repo.head().ok()
@@ -56,13 +57,13 @@ impl Inode for Root {
     }
 
     fn readdir<'a>(&mut self, _repo: &git2::Repository, offset: u64,
-               mut add: Box<FnMut(Id, FileType, &Path) -> bool + 'a>
+               mut add: Box<FnMut(Id, FileType, &PosixPath) -> bool + 'a>
               ) -> Result<(), libc::c_int> {
         if offset == 0 {
-            add(self.head, FileType::Unknown, &Path::new("HEAD"));
+            add(self.head, FileType::Unknown, &PosixPath::new("HEAD"));
         }
         if offset <= 1 {
-            add(self.refs, FileType::Unknown, &Path::new("refs"));
+            add(self.refs, FileType::Unknown, &PosixPath::new("refs"));
         }
         Ok(())
     }

src/tree.rs

@@ -10,6 +10,7 @@ use git2;
 use libc;
 use libc::consts::os::posix88;
 use std::old_io::{FileType, USER_DIR};
+use std::old_path::PosixPath;
 use std::path::AsPath;
 
 use inode;
@@ -36,7 +37,7 @@ impl Tree {
 }
 
 impl Inode for Tree {
-    fn lookup(&mut self, repo: &git2::Repository, name: &Path
+    fn lookup(&mut self, repo: &git2::Repository, name: &PosixPath
               ) -> Result<Id, libc::c_int> {
         self.tree(repo).and_then(|tree| {
             match tree.get_path(name.as_path()) {
@@ -58,11 +59,11 @@ impl Inode for Tree {
     }
 
     fn readdir<'a>(&'a mut self, repo: &git2::Repository, offset: u64,
-               mut add: Box<FnMut(Id, FileType, &Path) -> bool + 'a>
+               mut add: Box<FnMut(Id, FileType, &PosixPath) -> bool + 'a>
               ) -> Result<(), libc::c_int> {
         let len = self.size;
         self.tree(repo).map(|tree| {
-            for i in range(offset, len) {
+            for i in (offset..len) {
                 let e = match tree.get(i as usize) {
                     Some(e) => e,
                     None => continue,
@@ -72,7 +73,7 @@ impl Inode for Tree {
                     Some(git2::ObjectType::Blob) => FileType::RegularFile,
                     _ => FileType::Unknown,
                 };
-                let path = Path::new(e.name_bytes());
+                let path = PosixPath::new(e.name_bytes());
                 if add(Id::Oid(e.id()), kind, &path) {
                     break;
                 }

tests/self.rs

@@ -1,6 +1,5 @@
 //! Test that this very testfile is accessible in our own mount.
 
-#![feature(path)]
 #![feature(path_ext)]
 
 extern crate gitfs;