Skip to content

Commit 9393fe4

Browse files
committed
---
yaml --- r: 236215 b: refs/heads/stable c: 96d1db2 h: refs/heads/master i: 236213: e79f1db 236211: 67c1665 236207: a68d684 v: v3
1 parent 4c0e2a4 commit 9393fe4

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
@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
3030
refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
3131
refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
32-
refs/heads/stable: e493027984b5961617c867a7003face00a057c92
32+
refs/heads/stable: 96d1db2b1a43a149a1d0436a03a72aa01a39efd2
3333
refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
3434
refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
3535
refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

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