Skip to content

Commit 9cf2de9

Browse files
committed
---
yaml --- r: 126986 b: refs/heads/snap-stage3 c: e99fc20 h: refs/heads/master v: v3
1 parent 647bf7a commit 9cf2de9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 7be8f0af0393dcdb077c2f6b1653836fd3fba235
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 2e2f53fad210543be39f6997991abcd403533676
4+
refs/heads/snap-stage3: e99fc20f9595590597e09795de5bfa3d361517a9
55
refs/heads/try: 502e4c045236682e9728539dc0d2b3d0b237f55c
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/rt/backtrace.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -465,13 +465,13 @@ mod imp {
465465
// be in "permanent memory", so we copy it to a static and then use the
466466
// static as the pointer.
467467
//
468-
// FIXME: We also call self_exe_name() on DragonFly BSD. I haven't
468+
// FIXME: We also call self_exe_name() on DragonFly BSD. I haven't
469469
// tested if this is required or not.
470470
unsafe fn init_state() -> *mut backtrace_state {
471471
static mut STATE: *mut backtrace_state = 0 as *mut backtrace_state;
472472
static mut LAST_FILENAME: [libc::c_char, ..256] = [0, ..256];
473473
if !STATE.is_null() { return STATE }
474-
let selfname = if cfg!(target_os = "freebsd") ||
474+
let selfname = if cfg!(target_os = "freebsd") ||
475475
cfg!(target_os = "dragonfly") {
476476
os::self_exe_name()
477477
} else {

branches/snap-stage3/src/libsyntax/abi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
use std::fmt;
1212

1313
#[deriving(PartialEq)]
14-
pub enum Os { OsWin32, OsMacos, OsLinux, OsAndroid, OsFreebsd, OsiOS,
14+
pub enum Os { OsWin32, OsMacos, OsLinux, OsAndroid, OsFreebsd, OsiOS,
1515
OsDragonfly }
1616

1717
#[deriving(PartialEq, Eq, Hash, Encodable, Decodable, Clone)]

0 commit comments

Comments
 (0)