---

yaml
---
r: 153936
b: refs/heads/try2
c: e99fc20
h: refs/heads/master
v: v3

Author: mneumann

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 2e2f53fad210543be39f6997991abcd403533676
+refs/heads/try2: e99fc20f9595590597e09795de5bfa3d361517a9
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/rt/backtrace.rs

@@ -465,13 +465,13 @@ mod imp {
         // be in "permanent memory", so we copy it to a static and then use the
         // static as the pointer.
         //
-        // FIXME: We also call self_exe_name() on DragonFly BSD. I haven't 
+        // FIXME: We also call self_exe_name() on DragonFly BSD. I haven't
         //        tested if this is required or not.
         unsafe fn init_state() -> *mut backtrace_state {
             static mut STATE: *mut backtrace_state = 0 as *mut backtrace_state;
             static mut LAST_FILENAME: [libc::c_char, ..256] = [0, ..256];
             if !STATE.is_null() { return STATE }
-            let selfname = if cfg!(target_os = "freebsd") || 
+            let selfname = if cfg!(target_os = "freebsd") ||
                               cfg!(target_os = "dragonfly") {
                 os::self_exe_name()
             } else {

branches/try2/src/libsyntax/abi.rs

@@ -11,7 +11,7 @@
 use std::fmt;
 
 #[deriving(PartialEq)]
-pub enum Os { OsWin32, OsMacos, OsLinux, OsAndroid, OsFreebsd, OsiOS, 
+pub enum Os { OsWin32, OsMacos, OsLinux, OsAndroid, OsFreebsd, OsiOS,
               OsDragonfly }
 
 #[deriving(PartialEq, Eq, Hash, Encodable, Decodable, Clone)]