Llewellyn/exa
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/exa.git synced 2024-11-26 22:06:26 +00:00
Code Issues Projects Releases Wiki Activity

current_dir -> getcwd

Browse Source 
current_dir returns a new PathBuf, but getcwd returns an old Path. One day I'll have to upgrade to the new Path library. One day.

Fixes #41.
This commit is contained in:
Ben S 2015-03-01 13:49:51 +00:00
parent f6276dfb9d
commit 027ca60d90
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/file.rs
View File

@ -1,7 +1,7 @@
use std::old_io::{fs, IoResult};
use std::old_io as io;
use std::ascii::AsciiExt;
use std::env::current_dir;
use std::os::getcwd;
use ansi_term::{ANSIString, ANSIStrings, Colour, Style};
use ansi_term::Style::Plain;
@ -451,7 +451,7 @@ impl<'a> File<'a> {
fn git_status(&self) -> Cell {
let status = match self.dir {
Some(d) => d.git_status(&current_dir().unwrap_or(Path::new(".")).join(&self.path),
Some(d) => d.git_status(&getcwd().unwrap_or(Path::new(".")).join(&self.path),
self.is_directory()),
None => GREY.paint("--").to_string(),
};

2
src/main.rs
View File

@ -1,4 +1,4 @@
#![feature(collections, core, env, io, libc, old_io, old_path, std_misc)]
#![feature(collections, core, env, io, libc, old_io, old_path, os, std_misc)]
// Other platforms than macos don't need std_misc but you can't
// use #[cfg] on features.