Skip to content

Commit 33dc5fe

Browse files
committed
---
yaml --- r: 80702 b: refs/heads/try c: 6812535 h: refs/heads/master v: v3
1 parent ff006a5 commit 33dc5fe

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cbd1eefbd350797b783df119fed7956d7e1c74ad
5-
refs/heads/try: a018a5c3433e20a56f642082586f4e4d28469381
5+
refs/heads/try: 68125359cdd053628b437c2b963bd82e1ff03523
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/libstd/fmt/parse.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ impl<'self> Parser<'self> {
554554
/// characters.
555555
fn word(&mut self) -> &'self str {
556556
let start = match self.cur.clone().next() {
557-
Some((pos, c)) if char::is_XID_start(c) => {
557+
Some((pos, c)) if char::is_alphabetic(c) => {
558558
self.cur.next();
559559
pos
560560
}
@@ -563,7 +563,7 @@ impl<'self> Parser<'self> {
563563
let mut end;
564564
loop {
565565
match self.cur.clone().next() {
566-
Some((_, c)) if char::is_XID_continue(c) => {
566+
Some((_, c)) if char::is_alphanumeric(c) => {
567567
self.cur.next();
568568
}
569569
Some((pos, _)) => { end = pos; break }

branches/try/src/libstd/unstable/dynamic_lib.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ mod test {
9090
use libc;
9191

9292
#[test]
93-
#[ignore(cfg(windows))] // FIXME #8818
93+
// #[ignore(cfg(windows))] // FIXME #8818
94+
#[ignore] // FIXME #9137 this library isn't thread-safe
9495
fn test_loading_cosine() {
9596
// The math library does not need to be loaded since it is already
9697
// statically linked in
@@ -121,6 +122,7 @@ mod test {
121122
#[cfg(target_os = "linux")]
122123
#[cfg(target_os = "macos")]
123124
#[cfg(target_os = "freebsd")]
125+
#[ignore] // FIXME #9137 this library isn't thread-safe
124126
fn test_errors_do_not_crash() {
125127
// Open /dev/null as a library to get an error, and make sure
126128
// that only causes an error, and not a crash.

branches/try/src/test/run-pass/ifmt.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ pub fn main() {
8282
t!(format!("{foo} {1} {bar} {0}", 0, 1, foo=2, bar=3), "2 1 3 0");
8383
t!(format!("{} {0:s}", "a"), "a a");
8484
t!(format!("{} {0}", "a"), "a a");
85-
t!(format!("{foo_bar}", foo_bar=1), "1");
8685

8786
// Methods should probably work
8887
t!(format!("{0, plural, =1{a#} =2{b#} zero{c#} other{d#}}", 0u), "c0");

0 commit comments

Comments
 (0)