diff options
| author | bors <bors@rust-lang.org> | 2023-07-05 16:08:43 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-05 16:08:43 +0000 |
| commit | 5dac6b320be868f898a3c753934eabc79ff2e406 (patch) | |
| tree | 0f24c192ef18ab3116802b703c2b373095c7e323 /compiler/rustc_codegen_llvm/src/llvm/ffi.rs | |
| parent | e4cd1610067501fa4d347eba7b18f77137dbbf48 (diff) | |
| parent | 560136f15d77af3e16e9db9baafbbfb2b1341450 (diff) | |
| download | rust-5dac6b320be868f898a3c753934eabc79ff2e406.tar.gz rust-5dac6b320be868f898a3c753934eabc79ff2e406.zip | |
Auto merge of #113370 - compiler-errors:rollup-8gvyy8e, r=compiler-errors
Rollup of 8 pull requests Successful merges: - #113010 (rust-installer & rls: remove exclusion from rustfmt & tidy ) - #113317 ( -Ztrait-solver=next: stop depending on old solver) - #113319 (`TypeParameterDefinition` always require a `DefId`) - #113320 (Add some extra information to opaque type cycle errors) - #113321 (Move `ty::ConstKind` to `rustc_type_ir`) - #113337 (Winnow specialized impls during selection in new solver) - #113355 (Move most coverage code out of `rustc_codegen_ssa`) - #113356 (Add support for NetBSD/riscv64 aka. riscv64gc-unknown-netbsd.) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/llvm/ffi.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/llvm/ffi.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs index b667bc4f6d4..8ee40b98e2d 100644 --- a/compiler/rustc_codegen_llvm/src/llvm/ffi.rs +++ b/compiler/rustc_codegen_llvm/src/llvm/ffi.rs @@ -1,7 +1,7 @@ #![allow(non_camel_case_types)] #![allow(non_upper_case_globals)] -use rustc_codegen_ssa::coverageinfo::map as coverage_map; +use crate::coverageinfo::map_data as coverage_map; use super::debuginfo::{ DIArray, DIBasicType, DIBuilder, DICompositeType, DIDerivedType, DIDescriptor, DIEnumerator, |