diff options
| author | Amanieu d'Antras <amanieu@gmail.com> | 2020-03-07 16:31:30 +0000 |
|---|---|---|
| committer | Amanieu d'Antras <amanieu@gmail.com> | 2020-03-07 16:31:30 +0000 |
| commit | 9f3679fe4485aa4be4a0de9abc8aca938c60db36 (patch) | |
| tree | d24e4b678140f29b8c683c83f737c057cbf10ff4 | |
| parent | 04f24b7c69a576533a3dba889c1a78f21e0d38a9 (diff) | |
| download | rust-9f3679fe4485aa4be4a0de9abc8aca938c60db36.tar.gz rust-9f3679fe4485aa4be4a0de9abc8aca938c60db36.zip | |
Apply review feedback
| -rw-r--r-- | src/libpanic_unwind/seh.rs | 2 | ||||
| -rw-r--r-- | src/librustc_codegen_llvm/intrinsic.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libpanic_unwind/seh.rs b/src/libpanic_unwind/seh.rs index c1656023b60..c294fe26327 100644 --- a/src/libpanic_unwind/seh.rs +++ b/src/libpanic_unwind/seh.rs @@ -237,7 +237,7 @@ static mut TYPE_DESCRIPTOR: _TypeDescriptor = _TypeDescriptor { macro_rules! define_cleanup { ($abi:tt) => { unsafe extern $abi fn exception_cleanup(e: *mut Exception) { - if let Some(b) = e.read().data { + if let Exception { data: Some(b) } = e.read() { drop(b); super::__rust_drop_panic(); } diff --git a/src/librustc_codegen_llvm/intrinsic.rs b/src/librustc_codegen_llvm/intrinsic.rs index d34540638f1..5ce18a9007a 100644 --- a/src/librustc_codegen_llvm/intrinsic.rs +++ b/src/librustc_codegen_llvm/intrinsic.rs @@ -1024,7 +1024,7 @@ fn codegen_gnu_try( // Codegens the shims described above: // // bx: - // invoke %func(%data) normal %normal unwind %catch + // invoke %try_func(%data) normal %normal unwind %catch // // normal: // ret 0 |