---

yaml
---
r: 125439
b: refs/heads/master
c: e99fc20
h: refs/heads/master
i:
  125437: c74b478
  125435: 5bf4624
  125431: 637805d
  125423: a088fb9
  125407: 53505e3
  125375: a0d6ce1
  125311: aea9240
  125183: 8894b9e
  124927: f1baf7a
v: v3

Author: mneumann

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2e2f53fad210543be39f6997991abcd403533676
+refs/heads/master: e99fc20f9595590597e09795de5bfa3d361517a9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
 refs/heads/try: e5e0db5bc45aa2de6887fbf51dec013ca5c025c6

trunk/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 {

trunk/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)]