Skip to content

Commit a3a7a6e

Browse files
killerswanbrson
authored andcommitted
---
yaml --- r: 11099 b: refs/heads/master c: a3f5626 h: refs/heads/master i: 11097: b324e8b 11095: 2b9a95d v: v3
1 parent f87ea51 commit a3a7a6e

File tree

11 files changed

+193
-145
lines changed

11 files changed

+193
-145
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 159aebc28bdd3e7667cb269d64dee844699dc3b0
2+
refs/heads/master: a3f5626ad1b5bc47ceddfb0d600cf6fd8a6dad8c
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/cargo/pgp.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ fn verify(root: str, data: str, sig: str, keyfp: str) -> bool {
9494
let p = gpg(["--homedir", path, "--with-fingerprint", "--verify", sig,
9595
data]);
9696
let res = "Primary key fingerprint: " + keyfp;
97-
for line in str::split(p.err, '\n' as u8) {
97+
for line in str::split_byte(p.err, '\n' as u8) {
9898
if line == res {
9999
ret true;
100100
}

trunk/src/comp/back/link.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,8 @@ fn build_link_meta(sess: session, c: ast::crate, output: str,
443443
none {
444444
let name =
445445
{
446-
let os = str::split(fs::basename(output), '.' as u8);
446+
let os = str::split_byte(
447+
fs::basename(output), '.' as u8);
447448
if (vec::len(os) < 2u) {
448449
sess.fatal(#fmt("Output file name %s doesn't\
449450
appear to have an extension", output));
@@ -578,7 +579,7 @@ fn link_binary(sess: session,
578579
} else { ret filename; }
579580
};
580581
fn rmext(filename: str) -> str {
581-
let parts = str::split(filename, '.' as u8);
582+
let parts = str::split_byte(filename, '.' as u8);
582583
vec::pop(parts);
583584
ret str::connect(parts, ".");
584585
}

trunk/src/comp/back/rpath.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ fn get_relative_to(abs1: fs::path, abs2: fs::path) -> fs::path {
128128
abs1, abs2);
129129
let normal1 = fs::normalize(abs1);
130130
let normal2 = fs::normalize(abs2);
131-
let split1 = str::split(normal1, os_fs::path_sep as u8);
132-
let split2 = str::split(normal2, os_fs::path_sep as u8);
131+
let split1 = str::split_byte(normal1, os_fs::path_sep as u8);
132+
let split2 = str::split_byte(normal2, os_fs::path_sep as u8);
133133
let len1 = vec::len(split1);
134134
let len2 = vec::len(split2);
135135
assert len1 > 0u;

trunk/src/comp/metadata/cstore.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ fn get_used_libraries(cstore: cstore) -> [str] {
120120
}
121121

122122
fn add_used_link_args(cstore: cstore, args: str) {
123-
p(cstore).used_link_args += str::split(args, ' ' as u8);
123+
p(cstore).used_link_args += str::split_byte(args, ' ' as u8);
124124
}
125125

126126
fn get_used_link_args(cstore: cstore) -> [str] {

trunk/src/compiletest/runtest.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ fn check_error_patterns(props: test_props,
199199

200200
let next_err_idx = 0u;
201201
let next_err_pat = props.error_patterns[next_err_idx];
202-
for line: str in str::split(procres.stdout, '\n' as u8) {
202+
for line: str in str::split_byte(procres.stdout, '\n' as u8) {
203203
if str::find(line, next_err_pat) > 0 {
204204
#debug("found error pattern %s", next_err_pat);
205205
next_err_idx += 1u;
@@ -246,7 +246,7 @@ fn check_expected_errors(expected_errors: [errors::expected_error],
246246
// filename:line1:col1: line2:col2: *warning:* msg
247247
// where line1:col1: is the starting point, line2:col2:
248248
// is the ending point, and * represents ANSI color codes.
249-
for line: str in str::split(procres.stdout, '\n' as u8) {
249+
for line: str in str::split_byte(procres.stdout, '\n' as u8) {
250250
let was_expected = false;
251251
vec::iteri(expected_errors) {|i, ee|
252252
if !found_flags[i] {
@@ -349,7 +349,7 @@ fn split_maybe_args(argstr: option<str>) -> [str] {
349349
}
350350

351351
alt argstr {
352-
option::some(s) { rm_whitespace(str::split(s, ' ' as u8)) }
352+
option::some(s) { rm_whitespace(str::split_byte(s, ' ' as u8)) }
353353
option::none { [] }
354354
}
355355
}
@@ -411,7 +411,7 @@ fn output_base_name(config: config, testfile: str) -> str {
411411
let base = config.build_base;
412412
let filename =
413413
{
414-
let parts = str::split(fs::basename(testfile), '.' as u8);
414+
let parts = str::split_byte(fs::basename(testfile), '.' as u8);
415415
parts = vec::slice(parts, 0u, vec::len(parts) - 1u);
416416
str::connect(parts, ".")
417417
};

0 commit comments

Comments
 (0)