Skip to content

Commit c092091

Browse files
committed
---
yaml --- r: 229144 b: refs/heads/try c: 96d1db2 h: refs/heads/master v: v3
1 parent 485f0c7 commit c092091

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
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: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: e493027984b5961617c867a7003face00a057c92
4+
refs/heads/try: 96d1db2b1a43a149a1d0436a03a72aa01a39efd2
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/libstd/rt/libunwind.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ pub enum _Unwind_Action {
3636

3737
#[cfg(target_arch = "arm")]
3838
#[repr(C)]
39+
#[derive(Copy, Clone)]
3940
pub enum _Unwind_State {
4041
_US_VIRTUAL_UNWIND_FRAME = 0,
4142
_US_UNWIND_FRAME_STARTING = 1,
@@ -46,6 +47,7 @@ pub enum _Unwind_State {
4647
}
4748

4849
#[repr(C)]
50+
#[derive(Copy, Clone)]
4951
pub enum _Unwind_Reason_Code {
5052
_URC_NO_REASON = 0,
5153
_URC_FOREIGN_EXCEPTION_CAUGHT = 1,

branches/try/src/libstd/rt/unwind/gcc.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,8 @@ pub mod eabi {
179179
}
180180
else { // cleanup phase
181181
unsafe {
182-
__gcc_personality_sj0(_version, actions, _exception_class, _ue_header,
183-
_context)
182+
__gcc_personality_sj0(version, actions, exception_class, ue_header,
183+
context)
184184
}
185185
}
186186
}

0 commit comments

Comments
 (0)