---

yaml
---
r: 89681
b: refs/heads/master
c: e6a1f6d
h: refs/heads/master
i:
  89679: 0f7d408
v: v3

Author: willingc

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 075347b4453e4b4bc4dd2d2370e408e92041d4ce
+refs/heads/master: e6a1f6d7df80f1063116fa48d4971f6baca8daaa
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/doc/po/ja/rust.md.po

@@ -678,13 +678,6 @@ msgid ""
 "and continues as any mixture hex digits and underscores."
 msgstr ""
 
-#. type: Bullet: '  * '
-#: doc/rust.md:326
-msgid ""
-"An _octal literal_ starts with the character sequence `U+0030` `U+006F` (`0o`) "
-"and continues as any mixture octal digits and underscores."
-msgstr ""
-
 #. type: Bullet: '  * '
 #: doc/rust.md:326
 msgid ""
@@ -747,7 +740,6 @@ msgid ""
 "123u;                              // type uint\n"
 "123_u;                             // type uint\n"
 "0xff_u8;                           // type u8\n"
-"0o70_i16;                          // type i16\n"
 "0b1111_1111_1001_0000_i32;         // type i32\n"
 "~~~~\n"
 msgstr ""

trunk/doc/po/ja/tutorial.md.po

@@ -849,7 +849,7 @@ msgstr "## プリミティブ型とリテラル"
 msgid ""
 "There are general signed and unsigned integer types, `int` and `uint`, as "
 "well as 8-, 16-, 32-, and 64-bit variants, `i8`, `u16`, etc.  Integers can "
-"be written in decimal (`144`), hexadecimal (`0x90`), octal (`0o70`), or binary "
+"be written in decimal (`144`), hexadecimal (`0x90`), or binary "
 "(`0b10010000`) base. Each integral type has a corresponding literal suffix "
 "that can be used to indicate the type of a literal: `i` for `int`, `u` for "
 "`uint`, `i8` for the `i8` type."

trunk/doc/po/rust.md.pot

@@ -661,7 +661,7 @@ msgstr ""
 
 #. type: Plain text
 #: doc/rust.md:319
-msgid "An _integer literal_ has one of four forms:"
+msgid "An _integer literal_ has one of three forms:"
 msgstr ""
 
 #. type: Bullet: '  * '
@@ -678,13 +678,6 @@ msgid ""
 "and continues as any mixture hex digits and underscores."
 msgstr ""
 
-#. type: Bullet: '  * '
-#: doc/rust.md:326
-msgid ""
-"An _octal literal_ starts with the character sequence `U+0030` `U+006F` (`0o`) "
-"and continues as any mixture octal digits and underscores."
-msgstr ""
-
 #. type: Bullet: '  * '
 #: doc/rust.md:326
 msgid ""
@@ -747,7 +740,6 @@ msgid ""
 "123u;                              // type uint\n"
 "123_u;                             // type uint\n"
 "0xff_u8;                           // type u8\n"
-"0o70_i16;                          // type i16\n"
 "0b1111_1111_1001_0000_i32;         // type i32\n"
 "~~~~\n"
 msgstr ""

trunk/doc/po/tutorial.md.pot

@@ -646,7 +646,7 @@ msgstr ""
 msgid ""
 "There are general signed and unsigned integer types, `int` and `uint`, as "
 "well as 8-, 16-, 32-, and 64-bit variants, `i8`, `u16`, etc.  Integers can "
-"be written in decimal (`144`), hexadecimal (`0x90`), octal (`0o70`), or binary "
+"be written in decimal (`144`), hexadecimal (`0x90`), or binary "
 "(`0b10010000`) base. Each integral type has a corresponding literal suffix "
 "that can be used to indicate the type of a literal: `i` for `int`, `u` for "
 "`uint`, `i8` for the `i8` type."

trunk/doc/rust.md

@@ -340,14 +340,12 @@ as they are differentiated by suffixes.
 
 ##### Integer literals
 
-An _integer literal_ has one of four forms:
+An _integer literal_ has one of three forms:
 
   * A _decimal literal_ starts with a *decimal digit* and continues with any
     mixture of *decimal digits* and _underscores_.
   * A _hex literal_ starts with the character sequence `U+0030` `U+0078`
     (`0x`) and continues as any mixture hex digits and underscores.
-  * An _octal literal_ starts with the character sequence `U+0030` `U+006F`
-    (`0o`) and continues as any mixture octal digits and underscores.
   * A _binary literal_ starts with the character sequence `U+0030` `U+0062`
     (`0b`) and continues as any mixture binary digits and underscores.
 
@@ -378,7 +376,6 @@ Examples of integer literals of various forms:
 123u;                              // type uint
 123_u;                             // type uint
 0xff_u8;                           // type u8
-0o70_i16;                          // type i16
 0b1111_1111_1001_0000_i32;         // type i32
 ~~~~
 

trunk/doc/tutorial.md

@@ -305,7 +305,7 @@ fn is_four(x: int) -> bool {
 
 There are general signed and unsigned integer types, `int` and `uint`,
 as well as 8-, 16-, 32-, and 64-bit variants, `i8`, `u16`, etc.
-Integers can be written in decimal (`144`), hexadecimal (`0x90`), octal (`0o70`), or
+Integers can be written in decimal (`144`), hexadecimal (`0x90`), or
 binary (`0b10010000`) base. Each integral type has a corresponding literal
 suffix that can be used to indicate the type of a literal: `i` for `int`,
 `u` for `uint`, `i8` for the `i8` type.

trunk/src/compiletest/errors.rs

@@ -52,8 +52,10 @@ fn parse_expected(line_num: uint, line: ~str) -> ~[ExpectedError] {
     let start_kind = idx;
     while idx < len && line[idx] != (' ' as u8) { idx += 1u; }
 
+    // FIXME: #4318 Instead of to_ascii and to_str_ascii, could use
+    // to_ascii_consume and to_str_consume to not do a unnecessary copy.
     let kind = line.slice(start_kind, idx);
-    let kind = kind.to_ascii().to_lower().into_str();
+    let kind = kind.to_ascii().to_lower().to_str_ascii();
 
     // Extract msg:
     while idx < len && line[idx] == (' ' as u8) { idx += 1u; }

trunk/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang

@@ -224,18 +224,13 @@
       [0-9a-fA-F]
     </define-regex>
 
-    <define-regex id="oct_digit" extended="true">
-      [0-7]
-    </define-regex>
-
     <context id="number" style-ref="number">
       <match extended="true">
         ((?&lt;=\.\.)|(?&lt;![\w\.]))
         (
         [1-9][0-9_]*\%{num_suffix}?|
         0[0-9_]*\%{num_suffix}?|
         0b[01_]+\%{int_suffix}?|
-        0o(\%{oct_digit}|_)+\%{int_suffix}?|
         0x(\%{hex_digit}|_)+\%{int_suffix}?
         )
         ((?![\w\.].)|(?=\.\.))

trunk/src/etc/kate/rust.xml

@@ -199,7 +199,6 @@
 			<Detect2Chars char="/" char1="/" attribute="Comment" context="Commentar 1"/>
 			<Detect2Chars char="/" char1="*" attribute="Comment" context="Commentar 2" beginRegion="Comment"/>
 			<RegExpr String="0x[0-9a-fA-F_]+&rustIntSuf;" attribute="Number" context="#stay"/>
-			<RegExpr String="0o[0-7_]+&rustIntSuf;" attribute="Number" context="#stay"/>
 			<RegExpr String="0b[0-1_]+&rustIntSuf;" attribute="Number" context="#stay"/>
 			<RegExpr String="[0-9][0-9_]*\.[0-9_]*([eE][+-]?[0-9_]+)?(f32|f64|f)?" attribute="Number" context="#stay"/>
 			<RegExpr String="[0-9][0-9_]*&rustIntSuf;" attribute="Number" context="#stay"/>

trunk/src/etc/vim/syntax/rust.vim

@@ -161,9 +161,6 @@ syn match     rustNumber      display "\<[0-9][0-9_]*\(i\|i8\|i16\|i32\|i64\)\>"
 syn match     rustHexNumber   display "\<0x[a-fA-F0-9_]\+\>"
 syn match     rustHexNumber   display "\<0x[a-fA-F0-9_]\+\(u\|u8\|u16\|u32\|u64\)\>"
 syn match     rustHexNumber   display "\<0x[a-fA-F0-9_]\+\(i8\|i16\|i32\|i64\)\>"
-syn match     rustOctNumber   display "\<0o[0-7_]\+\>"
-syn match     rustOctNumber   display "\<0o[0-7_]\+\(u\|u8\|u16\|u32\|u64\)\>"
-syn match     rustOctNumber   display "\<0o[0-7_]\+\(i8\|i16\|i32\|i64\)\>"
 syn match     rustBinNumber   display "\<0b[01_]\+\>"
 syn match     rustBinNumber   display "\<0b[01_]\+\(u\|u8\|u16\|u32\|u64\)\>"
 syn match     rustBinNumber   display "\<0b[01_]\+\(i8\|i16\|i32\|i64\)\>"
@@ -201,7 +198,6 @@ syn region rustFoldBraces start="{" end="}" transparent fold
 
 " Default highlighting {{{1
 hi def link rustHexNumber       rustNumber
-hi def link rustOctNumber       rustNumber
 hi def link rustBinNumber       rustNumber
 hi def link rustIdentifierPrime rustIdentifier
 hi def link rustTrait           rustType

trunk/src/libextra/sort.rs

@@ -887,8 +887,12 @@ mod tests {
         // tjc: funny that we have to use parens
         fn ile(x: &(&'static str), y: &(&'static str)) -> bool
         {
-            let x = x.to_ascii().to_lower().into_str();
-            let y = y.to_ascii().to_lower().into_str();
+            // FIXME: #4318 Instead of to_ascii and to_str_ascii, could use
+            // to_ascii_move and to_str_move to not do a unnecessary clone.
+            // (Actually, could just remove the to_str_* call, but needs an deriving(Ord) on
+            // Ascii)
+            let x = x.to_ascii().to_lower().to_str_ascii();
+            let y = y.to_ascii().to_lower().to_str_ascii();
             x <= y
         }
 

trunk/src/libextra/time.rs

@@ -965,35 +965,8 @@ mod tests {
     use super::*;
 
     use std::f64;
+    use std::os;
     use std::result::{Err, Ok};
-    use std::libc;
-
-    #[cfg(windows)]
-    #[fixed_stack_segment]
-    fn set_time_zone() {
-        // Windows crt doesn't see any environment variable set by
-        // `SetEnvironmentVariable`, which `os::setenv` internally uses.
-        // It is why we use `putenv` here.
-        extern {
-            fn _putenv(envstring: *libc::c_char) -> libc::c_int;
-        }
-
-        unsafe {
-            // Windows does not understand "America/Los_Angeles".
-            // PST+08 may look wrong, but not! "PST" indicates
-            // the name of timezone. "+08" means UTC = local + 08.
-            do "TZ=PST+08".with_c_str |env| {
-                _putenv(env);
-            }
-        }
-        tzset();
-    }
-    #[cfg(not(windows))]
-    fn set_time_zone() {
-        use std::os;
-        os::setenv("TZ", "America/Los_Angeles");
-        tzset();
-    }
 
     fn test_get_time() {
         static SOME_RECENT_DATE: i64 = 1325376000i64; // 2012-01-01T00:00:00Z
@@ -1034,54 +1007,57 @@ mod tests {
     }
 
     fn test_at_utc() {
-        set_time_zone();
+        os::setenv("TZ", "America/Los_Angeles");
+        tzset();
 
         let time = Timespec::new(1234567890, 54321);
         let utc = at_utc(time);
 
-        assert_eq!(utc.tm_sec, 30_i32);
-        assert_eq!(utc.tm_min, 31_i32);
-        assert_eq!(utc.tm_hour, 23_i32);
-        assert_eq!(utc.tm_mday, 13_i32);
-        assert_eq!(utc.tm_mon, 1_i32);
-        assert_eq!(utc.tm_year, 109_i32);
-        assert_eq!(utc.tm_wday, 5_i32);
-        assert_eq!(utc.tm_yday, 43_i32);
-        assert_eq!(utc.tm_isdst, 0_i32);
-        assert_eq!(utc.tm_gmtoff, 0_i32);
-        assert_eq!(utc.tm_zone, ~"UTC");
-        assert_eq!(utc.tm_nsec, 54321_i32);
+        assert!(utc.tm_sec == 30_i32);
+        assert!(utc.tm_min == 31_i32);
+        assert!(utc.tm_hour == 23_i32);
+        assert!(utc.tm_mday == 13_i32);
+        assert!(utc.tm_mon == 1_i32);
+        assert!(utc.tm_year == 109_i32);
+        assert!(utc.tm_wday == 5_i32);
+        assert!(utc.tm_yday == 43_i32);
+        assert!(utc.tm_isdst == 0_i32);
+        assert!(utc.tm_gmtoff == 0_i32);
+        assert!(utc.tm_zone == ~"UTC");
+        assert!(utc.tm_nsec == 54321_i32);
     }
 
     fn test_at() {
-        set_time_zone();
+        os::setenv("TZ", "America/Los_Angeles");
+        tzset();
 
         let time = Timespec::new(1234567890, 54321);
         let local = at(time);
 
         error!("time_at: {:?}", local);
 
-        assert_eq!(local.tm_sec, 30_i32);
-        assert_eq!(local.tm_min, 31_i32);
-        assert_eq!(local.tm_hour, 15_i32);
-        assert_eq!(local.tm_mday, 13_i32);
-        assert_eq!(local.tm_mon, 1_i32);
-        assert_eq!(local.tm_year, 109_i32);
-        assert_eq!(local.tm_wday, 5_i32);
-        assert_eq!(local.tm_yday, 43_i32);
-        assert_eq!(local.tm_isdst, 0_i32);
-        assert_eq!(local.tm_gmtoff, -28800_i32);
+        assert!(local.tm_sec == 30_i32);
+        assert!(local.tm_min == 31_i32);
+        assert!(local.tm_hour == 15_i32);
+        assert!(local.tm_mday == 13_i32);
+        assert!(local.tm_mon == 1_i32);
+        assert!(local.tm_year == 109_i32);
+        assert!(local.tm_wday == 5_i32);
+        assert!(local.tm_yday == 43_i32);
+        assert!(local.tm_isdst == 0_i32);
+        assert!(local.tm_gmtoff == -28800_i32);
 
         // FIXME (#2350): We should probably standardize on the timezone
         // abbreviation.
         let zone = &local.tm_zone;
         assert!(*zone == ~"PST" || *zone == ~"Pacific Standard Time");
 
-        assert_eq!(local.tm_nsec, 54321_i32);
+        assert!(local.tm_nsec == 54321_i32);
     }
 
     fn test_to_timespec() {
-        set_time_zone();
+        os::setenv("TZ", "America/Los_Angeles");
+        tzset();
 
         let time = Timespec::new(1234567890, 54321);
         let utc = at_utc(time);
@@ -1091,7 +1067,8 @@ mod tests {
     }
 
     fn test_conversions() {
-        set_time_zone();
+        os::setenv("TZ", "America/Los_Angeles");
+        tzset();
 
         let time = Timespec::new(1234567890, 54321);
         let utc = at_utc(time);
@@ -1106,7 +1083,8 @@ mod tests {
     }
 
     fn test_strptime() {
-        set_time_zone();
+        os::setenv("TZ", "America/Los_Angeles");
+        tzset();
 
         match strptime("", "") {
           Ok(ref tm) => {
@@ -1270,7 +1248,8 @@ mod tests {
     }
 
     fn test_ctime() {
-        set_time_zone();
+        os::setenv("TZ", "America/Los_Angeles");
+        tzset();
 
         let time = Timespec::new(1234567890, 54321);
         let utc   = at_utc(time);
@@ -1283,7 +1262,8 @@ mod tests {
     }
 
     fn test_strftime() {
-        set_time_zone();
+        os::setenv("TZ", "America/Los_Angeles");
+        tzset();
 
         let time = Timespec::new(1234567890, 54321);
         let utc = at_utc(time);
@@ -1343,7 +1323,8 @@ mod tests {
         // abbreviation.
         let rfc822 = local.rfc822();
         let prefix = ~"Fri, 13 Feb 2009 15:31:30 ";
-        assert!(rfc822 == prefix + "PST" || rfc822 == prefix + "Pacific Standard Time");
+        assert!(rfc822 == prefix + "PST" ||
+                     rfc822 == prefix + "Pacific Standard Time");
 
         assert_eq!(local.ctime(), ~"Fri Feb 13 15:31:30 2009");
         assert_eq!(local.rfc822z(), ~"Fri, 13 Feb 2009 15:31:30 -0800");

trunk/src/libextra/url.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -581,7 +581,7 @@ fn get_path(rawurl: &str, authority: bool) ->
         match c {
           'A' .. 'Z' | 'a' .. 'z' | '0' .. '9' | '&' |'\'' | '(' | ')' | '.'
           | '@' | ':' | '%' | '/' | '+' | '!' | '*' | ',' | ';' | '='
-          | '_' | '-' | '~' => {
+          | '_' | '-' => {
             continue;
           }
           '?' | '#' => {
@@ -824,15 +824,15 @@ mod tests {
 
     #[test]
     fn test_url_parse() {
-        let url = ~"http://user:[email protected]:8080/doc/~u?s=v#something";
+        let url = ~"http://user:[email protected]:8080/doc?s=v#something";
 
         let up = from_str(url);
         let u = up.unwrap();
         assert_eq!(&u.scheme, &~"http");
         assert_eq!(&u.user, &Some(UserInfo::new(~"user", Some(~"pass"))));
         assert_eq!(&u.host, &~"rust-lang.org");
         assert_eq!(&u.port, &Some(~"8080"));
-        assert_eq!(&u.path, &~"/doc/~u");
+        assert_eq!(&u.path, &~"/doc");
         assert_eq!(&u.query, &~[(~"s", ~"v")]);
         assert_eq!(&u.fragment, &Some(~"something"));
     }

trunk/src/librustc/driver/driver.rs

@@ -669,8 +669,10 @@ pub fn build_session_options(binary: @str,
     for level in lint_levels.iter() {
         let level_name = lint::level_to_str(*level);
 
+        // FIXME: #4318 Instead of to_ascii and to_str_ascii, could use
+        // to_ascii_move and to_str_move to not do a unnecessary copy.
         let level_short = level_name.slice_chars(0, 1);
-        let level_short = level_short.to_ascii().to_upper().into_str();
+        let level_short = level_short.to_ascii().to_upper().to_str_ascii();
         let flags = vec::append(matches.opt_strs(level_short),
                                 matches.opt_strs(level_name));
         for lint_name in flags.iter() {