diff options
| author | bors <bors@rust-lang.org> | 2018-09-14 07:18:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-14 07:18:25 +0000 |
| commit | fccde0018a618eb6f45d2a3c97f629809994dff6 (patch) | |
| tree | d4c725cd7dfd72336822e39f899c27dbf13a6d99 /src/librustc_codegen_llvm/debuginfo | |
| parent | 6ff0b2ed163dab4389d88b14b5729514c11c682e (diff) | |
| parent | dd4f5a2d48d986e0bf23b7cc690d3c2422d4391a (diff) | |
| download | rust-fccde0018a618eb6f45d2a3c97f629809994dff6.tar.gz rust-fccde0018a618eb6f45d2a3c97f629809994dff6.zip | |
Auto merge of #54215 - kennytm:rollup, r=kennytm
Rollup of 8 pull requests Successful merges: - #53218 (Add a implementation of `From` for converting `&'a Option<T>` into `Option<&'a T>`) - #54024 (Fix compiling some rustc crates to wasm) - #54095 (Rename all mentions of `nil` to `unit`) - #54173 (Suggest valid crate type if invalid crate type is found) - #54194 (Remove println!() statement from HashMap unit test) - #54203 (Fix the stable release of os_str_str_ref_eq) - #54207 (re-mark the never docs as unstable) - #54210 (Update Cargo) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_codegen_llvm/debuginfo')
| -rw-r--r-- | src/librustc_codegen_llvm/debuginfo/type_names.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustc_codegen_llvm/debuginfo/type_names.rs b/src/librustc_codegen_llvm/debuginfo/type_names.rs index 95a094bf909..f9eb80a1988 100644 --- a/src/librustc_codegen_llvm/debuginfo/type_names.rs +++ b/src/librustc_codegen_llvm/debuginfo/type_names.rs @@ -160,7 +160,7 @@ pub fn push_debuginfo_type_name<'a, 'tcx>(cx: &CodegenCx<'a, 'tcx>, output.push(')'); - if !sig.output().is_nil() { + if !sig.output().is_unit() { output.push_str(" -> "); push_debuginfo_type_name(cx, sig.output(), true, output); } |