diff options
| author | bors <bors@rust-lang.org> | 2016-10-08 05:55:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-08 05:55:27 -0700 |
| commit | 4344f147aad2ae8ea9c955642f42c812173feb14 (patch) | |
| tree | b509efb0461bdfdc7183a8e78f0ec877fb50b4e7 /src/libpanic_unwind | |
| parent | b5fcca5cd76f9e4bcf2a31f7b3a9a7a0deb6fe3b (diff) | |
| parent | 69f4126da56348a8a3ec2c522c6a9534ff9531f8 (diff) | |
Auto merge of #37039 - Manishearth:rollup, r=Manishearth
Rollup of 6 pull requests - Successful merges: #36937, #37016, #37028, #37029, #37031, #37034 - Failed merges: #37027
Diffstat (limited to 'src/libpanic_unwind')
| -rw-r--r-- | src/libpanic_unwind/Cargo.lock | 36 | ||||
| -rw-r--r-- | src/libpanic_unwind/gcc.rs | 2 |
2 files changed, 1 insertions, 37 deletions
diff --git a/src/libpanic_unwind/Cargo.lock b/src/libpanic_unwind/Cargo.lock deleted file mode 100644 index 0cf75c94150..00000000000 --- a/src/libpanic_unwind/Cargo.lock +++ /dev/null @@ -1,36 +0,0 @@ -[root] -name = "panic_unwind" -version = "0.0.0" -dependencies = [ - "alloc 0.0.0", - "core 0.0.0", - "libc 0.0.0", - "unwind 0.0.0", -] - -[[package]] -name = "alloc" -version = "0.0.0" -dependencies = [ - "core 0.0.0", -] - -[[package]] -name = "core" -version = "0.0.0" - -[[package]] -name = "libc" -version = "0.0.0" -dependencies = [ - "core 0.0.0", -] - -[[package]] -name = "unwind" -version = "0.0.0" -dependencies = [ - "core 0.0.0", - "libc 0.0.0", -] - diff --git a/src/libpanic_unwind/gcc.rs b/src/libpanic_unwind/gcc.rs index 33b24fbaa26..b0e05ff2058 100644 --- a/src/libpanic_unwind/gcc.rs +++ b/src/libpanic_unwind/gcc.rs @@ -287,7 +287,7 @@ unsafe extern "C" fn rust_eh_unwind_resume(panic_ctx: *mut u8) -> ! { // to actively register their unwind info sections via unwinder API. // // This module defines two symbols which are referenced and called from -// rsbegin.rs to reigster our information with the GCC runtime. The +// rsbegin.rs to register our information with the GCC runtime. The // implementation of stack unwinding is (for now) deferred to libgcc_eh, however // Rust crates use these Rust-specific entry points to avoid potential clashes // with any GCC runtime. |