Skip to content

Commit 7a69c5d

Browse files
committed
---
yaml --- r: 224632 b: refs/heads/beta c: 96d1db2 h: refs/heads/master v: v3
1 parent 2372a24 commit 7a69c5d

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
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: e493027984b5961617c867a7003face00a057c92
26+
refs/heads/beta: 96d1db2b1a43a149a1d0436a03a72aa01a39efd2
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/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/beta/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)