summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilipp Gesang <phg@phi-gamma.net>2015-05-07 00:10:55 +0200
committerPhilipp Gesang <phg@phi-gamma.net>2015-05-07 00:10:55 +0200
commit308fb4f7923989e90087fb70a6d1f914af3ede67 (patch)
treee0a2f74d660bf78f2dbd6dbb52f126e7a1c2fc1d /src
parent54dee14e65b1090c75874ebc8f0c60cd049c409b (diff)
downloadvtcol-308fb4f7923989e90087fb70a6d1f914af3ede67.tar.gz
vtcol.rs: adapt symbol paths for fs, io and std
Diffstat (limited to 'src')
-rw-r--r--src/vtcol.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/vtcol.rs b/src/vtcol.rs
index d6b46fd..d3001a7 100644
--- a/src/vtcol.rs
+++ b/src/vtcol.rs
@@ -126,7 +126,7 @@ impl<'a> Job<'a> {
new ()
-> Job<'a>
{
- let argv = std::os::args();
+ let argv = std::env::args();
let this = argv[0].clone();
let opts = &[
getopts::optopt("s", "scheme", "predefined color scheme", "NAME"),
@@ -393,7 +393,7 @@ impl Palette {
pub fn
from_buffered_reader
- (reader : &mut std::io::BufferedReader<std::io::File>)
+ (reader : &mut std::io::BufReader<std::fs::File>)
-> Palette
{
let mut pal_idx : usize = 0_usize;
@@ -438,13 +438,13 @@ impl Palette {
{
/* Check if file exists
*/
- let path = Path::new(fname.as_bytes());
- let file = match std::io::File::open(&path)
+ let path = std::path::Path::new(fname.as_bytes());
+ let file = match std::fs::File::open(&path)
{
Err(e) => panic!("failed to open {} as file ({})", fname, e),
Ok(f) => f
};
- let mut reader = std::io::BufferedReader::new(file);
+ let mut reader = std::io::BufReader::new(file);
/* Parse scheme file
*/