---

yaml
---
r: 83183
b: refs/heads/auto
c: 82f5f65
h: refs/heads/master
i:
  83181: e650c48
  83179: 67d70f1
  83175: 097e4c0
  83167: 6c836a8
v: v3

Author: alexcrichton

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 737413d72a714e55ff53e591e8190b490c194a53
+refs/heads/auto: 82f5f65076e604ec70a6e09cdbe8dddb8b3b7c44
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

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

@@ -85,6 +85,7 @@
 		<keyword>u64</keyword>
 		<keyword>f32</keyword>
 		<keyword>f64</keyword>
+		<keyword>float</keyword>
 		<keyword>char</keyword>
 		<keyword>str</keyword>
 		<keyword>Either</keyword>
@@ -204,36 +205,16 @@
       </include>
     </context>
 
-    <define-regex id="int_suffix" extended="true">
-      (i8|i16|i32|i64|i|u8|u16|u32|u64|u)
-    </define-regex>
-
-    <define-regex id="exponent" extended="true">
-      ([eE][+-]?[0-9_]+)
-    </define-regex>
-
-    <define-regex id="float_suffix" extended="true">
-      (\%{exponent}?(f32|f64)?)|(\.[0-9][0-9_]*\%{exponent}?)?(f32|f64)?|\.
-    </define-regex>
-
-    <define-regex id="num_suffix" extended="true">
-      \%{int_suffix}|\%{float_suffix}
-    </define-regex>
-
-    <define-regex id="hex_digit" extended="true">
-      [0-9a-fA-F]
-    </define-regex>
-
     <context id="number" style-ref="number">
       <match extended="true">
-        ((?&lt;=\.\.)|(?&lt;![\w\.]))
+        (?&lt;![\w\.])
         (
-        [1-9][0-9_]*\%{num_suffix}?|
-        0[0-9_]*\%{num_suffix}?|
-        0b[01_]+\%{int_suffix}?|
-        0x(\%{hex_digit}|_)+\%{int_suffix}?
+        0x[0-9a-fA-F_]+(u8|u16|u32|u64|i8|i16|i32|i64|u|i)?|
+        0b[0-1_]+(u8|u16|u32|u64|i8|i16|i32|i64|u|i)?|
+        [0-9][0-9_]*\.[0-9_]*([eE][+-]?[0-9_]+)?(f32|f64|f)?|
+        [0-9][0-9_]*(u8|u16|u32|u64|i8|i16|i32|i64|u|i)?
         )
-        ((?![\w\.].)|(?=\.\.))
+        (?![\w\.])
       </match>
     </context>
 
@@ -253,37 +234,32 @@
       </match>
     </context>
 
-    <define-regex id="common_escape" extended="true">
-      '|"|
-      \\|n|r|t|
-      x\%{hex_digit}{2}|
-      u\%{hex_digit}{4}|
-      U\%{hex_digit}{8}
-    </define-regex>
-
-    <context id="string_escape" style-ref="def:special-char">
-      <match>\\\%{common_escape}</match>
-    </context>
-
     <context id="string" style-ref="string" class="string" class-disabled="no-spell-check">
       <start>"</start>
       <end>"</end>
       <include>
-        <context ref="string_escape"/>
+        <context ref="def:escape"/>
         <context ref="def:line-continue"/>
       </include>
     </context>
 
-    <context id="char" style-ref="char">
-      <match extended="true">'([^\\']|\\\%{common_escape})'</match>
+    <define-regex id="hex_digit" extended="true">
+      [0-9a-fA-F]
+    </define-regex>
+
+    <define-regex id="common_escape" extended="true">
+      (n|r|t)|
+      x\%{hex_digit}{2}|
+      u\%{hex_digit}{4}|
+      U\%{hex_digit}{8}
+    </define-regex>
+
+    <context id="char" style-ref="char" class="char">
+      <match extended="true">'([^\\]|\\\%{common_escape})'</match>
     </context>
 
     <context id="attribute" style-ref="attribute" class="attribute">
-      <start extended="true">\#\[</start>
-      <end>\]</end>
-      <include>
-        <context ref="def:in-comment"/>
-      </include>
+      <match extended="true">\#\[[^\]]+\]</match>
     </context>
 
     <context id="rust" class="no-spell-check">

branches/auto/src/libstd/managed.rs

@@ -17,6 +17,13 @@ use ptr::to_unsafe_ptr;
 pub static RC_MANAGED_UNIQUE : uint = (-2) as uint;
 pub static RC_IMMORTAL : uint = 0x77777777;
 
+/// Returns the refcount of a shared box (as just before calling this)
+#[inline]
+pub fn refcount<T>(t: @T) -> uint {
+    use unstable::raw::Repr;
+    unsafe { (*t.repr()).ref_count }
+}
+
 /// Determine if two shared boxes point to the same object
 #[inline]
 pub fn ptr_eq<T>(a: @T, b: @T) -> bool {

branches/auto/src/libstd/sys.rs

@@ -13,22 +13,12 @@
 #[allow(missing_doc)];
 
 use c_str::ToCStr;
-use cast;
 use libc::size_t;
 use libc;
 use repr;
 use rt::task;
 use str;
 
-/// Returns the refcount of a shared box (as just before calling this)
-#[inline]
-pub fn refcount<T>(t: @T) -> uint {
-    unsafe {
-        let ref_ptr: *uint = cast::transmute_copy(&t);
-        *ref_ptr - 1
-    }
-}
-
 pub fn log_str<T>(t: &T) -> ~str {
     use rt::io;
     use rt::io::Decorator;

branches/auto/src/test/run-pass/match-pattern-drop.rs

@@ -14,11 +14,11 @@
 enum t { make_t(@int), clam, }
 
 fn foo(s: @int) {
-    info2!("{:?}", ::std::sys::refcount(s));
-    let count = ::std::sys::refcount(s);
+    info2!("{:?}", ::std::managed::refcount(s));
+    let count = ::std::managed::refcount(s);
     let x: t = make_t(s); // ref up
-    assert_eq!(::std::sys::refcount(s), count + 1u);
-    info2!("{:?}", ::std::sys::refcount(s));
+    assert_eq!(::std::managed::refcount(s), count + 1u);
+    info2!("{:?}", ::std::managed::refcount(s));
 
     match x {
       make_t(y) => {
@@ -27,19 +27,19 @@ fn foo(s: @int) {
       }
       _ => { info2!("?"); fail2!(); }
     }
-    info2!("{:?}", ::std::sys::refcount(s));
-    assert_eq!(::std::sys::refcount(s), count + 1u);
-    let _ = ::std::sys::refcount(s); // don't get bitten by last-use.
+    info2!("{:?}", ::std::managed::refcount(s));
+    assert_eq!(::std::managed::refcount(s), count + 1u);
+    let _ = ::std::managed::refcount(s); // don't get bitten by last-use.
 }
 
 pub fn main() {
     let s: @int = @0; // ref up
 
-    let count = ::std::sys::refcount(s);
+    let count = ::std::managed::refcount(s);
 
     foo(s); // ref up then down
 
-    info2!("{}", ::std::sys::refcount(s));
-    let count2 = ::std::sys::refcount(s);
+    info2!("{}", ::std::managed::refcount(s));
+    let count2 = ::std::managed::refcount(s);
     assert_eq!(count, count2);
 }

branches/auto/src/test/run-pass/unique-copy-box.rs

@@ -10,14 +10,14 @@
 
 #[allow(unused_variable)];
 
-use std::sys;
+use std::managed;
 
 pub fn main() {
     let i = ~@1;
     let j = ~@2;
-    let rc1 = sys::refcount(*i);
+    let rc1 = managed::refcount(*i);
     let j = i.clone();
-    let rc2 = sys::refcount(*i);
+    let rc2 = managed::refcount(*i);
     error2!("rc1: {} rc2: {}", rc1, rc2);
     assert_eq!(rc1 + 1u, rc2);
 }