diff options
| author | bors <bors@rust-lang.org> | 2023-05-06 00:34:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-06 00:34:37 +0000 |
| commit | 6d140d59bb957903b02ddb993450509d8d92b448 (patch) | |
| tree | 2e74d588be207d6ee188e6182e851fc1dc660d07 /compiler/rustc_codegen_llvm/src/errors.rs | |
| parent | 963e5c0eff171160238dc2a2c0ba7a1912fada67 (diff) | |
| parent | 393e285e14fcc8477d74ed3919460e7a53d2fbe1 (diff) | |
| download | rust-6d140d59bb957903b02ddb993450509d8d92b448.tar.gz rust-6d140d59bb957903b02ddb993450509d8d92b448.zip | |
Auto merge of #111271 - JohnTitor:rollup-t07qk1c, r=JohnTitor
Rollup of 8 pull requests Successful merges: - #109677 (Stabilize raw-dylib, link_ordinal, import_name_type and -Cdlltool) - #110780 (rustdoc-search: add slices and arrays to index) - #110830 (Add FreeBSD cpuset support to `std::thread::available_concurrency`) - #111139 (Fix MXCSR configuration dependent timing) - #111239 (Remove unnecessary attribute from a diagnostic) - #111246 (forbid escaping bound vars in combine) - #111251 (Issue 109502 follow up, remove unnecessary Vec::new() from compile_test()) - #111261 (Mark `ErrorGuaranteed` constructor as deprecated so people don't use it) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/errors.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/errors.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/errors.rs b/compiler/rustc_codegen_llvm/src/errors.rs index bae88d94293..672087de315 100644 --- a/compiler/rustc_codegen_llvm/src/errors.rs +++ b/compiler/rustc_codegen_llvm/src/errors.rs @@ -67,7 +67,8 @@ pub(crate) struct ErrorWritingDEFFile { #[derive(Diagnostic)] #[diag(codegen_llvm_error_calling_dlltool)] -pub(crate) struct ErrorCallingDllTool { +pub(crate) struct ErrorCallingDllTool<'a> { + pub dlltool_path: Cow<'a, str>, pub error: std::io::Error, } |