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

Update to nightly

This commit is contained in:
Brian Anderson 2014-05-31 17:41:32 -07:00
parent fa76f79129
commit 2bf64159e0
10 changed files with 12 additions and 12 deletions

View file

@ -105,7 +105,7 @@ fn decode(input: &mut Reader, ignore_garbage: bool) {
let standard_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
to_decode = to_decode.as_slice()
.trim_chars(|c| !standard_chars.contains_char(c))
.into_owned()
.into_string()
}
match to_decode.as_slice().from_base64() {

View file

@ -82,7 +82,7 @@ pub fn uumain(args: Vec<String>) {
exec(files, number_mode, show_nonprint, show_ends, show_tabs, squeeze_blank);
}
#[deriving(Eq)]
#[deriving(Eq, PartialEq)]
enum NumberingMode {
NumberNone,
NumberNonEmpty,

View file

@ -11,7 +11,7 @@
extern crate getopts;
use std::cmp::TotalOrd;
use std::cmp::Ord;
use std::io::{BufferedReader, IoResult, print};
use std::io::fs::File;
use std::io::stdio::stdin;

View file

@ -24,7 +24,7 @@ use getopts::{
usage,
};
#[deriving(Eq)]
#[deriving(Eq, PartialEq)]
pub enum Mode {
Copy,
Help,

4
env/env.rs vendored
View file

@ -87,7 +87,7 @@ pub fn uumain(args: Vec<String>) {
match (name, value) {
(Some(n), Some(v)) => {
opts.sets.push((n.into_owned(), v.into_owned()));
opts.sets.push((n.into_string(), v.into_string()));
}
_ => {
// read the program now
@ -159,7 +159,7 @@ pub fn uumain(args: Vec<String>) {
match (name, value) {
(Some(n), Some(v)) => {
// yes
opts.sets.push((n.into_owned(), v.into_owned()));
opts.sets.push((n.into_string(), v.into_string()));
wait_cmd = true;
}
// no, its a program-like opt

@ -1 +1 @@
Subproject commit 616786caeba62773a9ff8dc541cc4d50bf384d59
Subproject commit adde85617a776ea98249504d653cb547a2353c98

View file

@ -9,8 +9,8 @@ static test_dir4: &'static str = "tmp/mkdir_test4/mkdir_test4_1";
static test_dir5: &'static str = "tmp/mkdir_test5/mkdir_test5_1";
fn cleanup(dir: &'static str) {
let d = dir.into_owned();
let p = Path::new(d.into_owned());
let d = dir.into_string();
let p = Path::new(d.into_string());
if p.exists() {
rmdir(&p).unwrap();
}

View file

@ -20,7 +20,7 @@ use std::io::{print, stdin, stdio, fs, BufferedReader};
#[path = "../common/util.rs"]
mod util;
#[deriving(Eq)]
#[deriving(Eq, PartialEq)]
enum InteractiveMode {
InteractiveNone,
InteractiveOnce,

View file

@ -86,7 +86,7 @@ fn tac(filenames: Vec<String>, before: bool, _: bool, separator: &str) {
let mut buf = data.into_string();
let len = buf.len();
buf.truncate(len - 1);
data = buf.into_owned();
data = buf.into_string();
}
let split_vec: Vec<&str> = data.as_slice().split_str(separator).collect();
let rev: String = split_vec.iter().rev().fold(String::new(), |mut a, &b| {

View file

@ -33,7 +33,7 @@ macro_rules! get_file_size(
})
)
#[deriving(Eq)]
#[deriving(Eq, PartialEq)]
enum TruncateMode {
Reference,
Extend,