diff options
| author | bors <bors@rust-lang.org> | 2025-06-24 15:35:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-06-24 15:35:57 +0000 |
| commit | 3129d37ef7075ee3cbaa3d6cbe1b5794f67192b0 (patch) | |
| tree | be7833cbe3675fc34b9ed32748a5d9535cc0f857 /compiler/rustc_codegen_ssa/src/lib.rs | |
| parent | 36b21637e93b038453924d3c66821089e71d8baa (diff) | |
| parent | e8dd3c356c037325bd85643f69367493a310d987 (diff) | |
Auto merge of #142962 - GuillaumeGomez:rollup-do1coji, r=GuillaumeGomez
Rollup of 7 pull requests Successful merges: - rust-lang/rust#137268 (Allow comparisons between `CStr`, `CString`, and `Cow<CStr>`.) - rust-lang/rust#142704 (Remove the deprecated unstable `concat_idents!` macro) - rust-lang/rust#142742 ([win][aarch64] Fix linking statics on Arm64EC, take 2) - rust-lang/rust#142843 (Enable reproducible-build-2 for Windows MSVC) - rust-lang/rust#142916 (rustdoc-json: Add test for `#[optimize(..)]`) - rust-lang/rust#142919 (rustdoc-json: Add test for `#[cold]`) - rust-lang/rust#142944 (Stats output tweaks) Failed merges: - rust-lang/rust#142825 (Port `#[track_caller]` to the new attribute system) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/lib.rs')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/lib.rs b/compiler/rustc_codegen_ssa/src/lib.rs index 523c9f2ad1c..23ed387a3ff 100644 --- a/compiler/rustc_codegen_ssa/src/lib.rs +++ b/compiler/rustc_codegen_ssa/src/lib.rs @@ -218,7 +218,7 @@ pub struct CrateInfo { pub target_cpu: String, pub target_features: Vec<String>, pub crate_types: Vec<CrateType>, - pub exported_symbols: UnordMap<CrateType, Vec<String>>, + pub exported_symbols: UnordMap<CrateType, Vec<(String, SymbolExportKind)>>, pub linked_symbols: FxIndexMap<CrateType, Vec<(String, SymbolExportKind)>>, pub local_crate_name: Symbol, pub compiler_builtins: Option<CrateNum>, |