1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00

Merge pull request #95 from Arcterus/master

Fix for latest Rust
This commit is contained in:
Heather 2014-02-15 13:58:48 +03:00
commit df93eaf5f4
2 changed files with 5 additions and 5 deletions

View file

@ -11,7 +11,7 @@
#[feature(macro_rules)]; #[feature(macro_rules)];
extern mod extra; extern mod serialize;
extern mod getopts; extern mod getopts;
use std::char; use std::char;
@ -25,8 +25,8 @@ use getopts::{
optopt, optopt,
usage usage
}; };
use extra::base64; use serialize::base64;
use extra::base64::{FromBase64, ToBase64}; use serialize::base64::{FromBase64, ToBase64};
#[path = "../util.rs"] #[path = "../util.rs"]
mod util; mod util;

View file

@ -107,7 +107,7 @@ struct NamedWriter {
impl Writer for NamedWriter { impl Writer for NamedWriter {
fn write(&mut self, buf: &[u8]) -> IoResult<()> { fn write(&mut self, buf: &[u8]) -> IoResult<()> {
with_path(self.path, || { with_path(self.path.clone(), || {
let val = self.inner.write(buf); let val = self.inner.write(buf);
if val.is_err() { if val.is_err() {
self.inner = ~NullWriter as ~Writer; self.inner = ~NullWriter as ~Writer;
@ -117,7 +117,7 @@ impl Writer for NamedWriter {
} }
fn flush(&mut self) -> IoResult<()> { fn flush(&mut self) -> IoResult<()> {
with_path(self.path, || { with_path(self.path.clone(), || {
let val = self.inner.flush(); let val = self.inner.flush();
if val.is_err() { if val.is_err() {
self.inner = ~NullWriter as ~Writer; self.inner = ~NullWriter as ~Writer;