mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #125409 - tbu-:pr_raw_dylib_only_windows, r=lcnr

Browse Source 
Rename `FrameworkOnlyWindows` to `RawDylibOnlyWindows`

Frameworks are Apple-specific, no idea why it had "framework" in the name before.
This commit is contained in:
Matthias Krüger 2024-05-23 14:09:24 +02:00 committed by GitHub
commit c9e457dbd6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_metadata/messages.ftl
View File

@ -91,9 +91,6 @@ metadata_found_staticlib =
found staticlib `{$crate_name}` instead of rlib or dylib{$add_info} found staticlib `{$crate_name}` instead of rlib or dylib{$add_info}
.help = please recompile that crate using --crate-type lib .help = please recompile that crate using --crate-type lib
metadata_framework_only_windows =
link kind `raw-dylib` is only supported on Windows targets
metadata_global_alloc_required = metadata_global_alloc_required =
no global memory allocator found but one is required; link to std or add `#[global_allocator]` to a static item that implements the GlobalAlloc trait no global memory allocator found but one is required; link to std or add `#[global_allocator]` to a static item that implements the GlobalAlloc trait
@ -233,6 +230,9 @@ metadata_profiler_builtins_needs_core =
metadata_raw_dylib_no_nul = metadata_raw_dylib_no_nul =
link name must not contain NUL characters if link kind is `raw-dylib` link name must not contain NUL characters if link kind is `raw-dylib`
metadata_raw_dylib_only_windows =
link kind `raw-dylib` is only supported on Windows targets
metadata_renaming_no_link = metadata_renaming_no_link =
renaming of the library `{$lib_name}` was specified, however this crate contains no `#[link(...)]` attributes referencing this library renaming of the library `{$lib_name}` was specified, however this crate contains no `#[link(...)]` attributes referencing this library

4
compiler/rustc_metadata/src/errors.rs
View File

@ -142,8 +142,8 @@ pub struct LinkFrameworkApple {
} }
#[derive(Diagnostic)] #[derive(Diagnostic)]
#[diag(metadata_framework_only_windows, code = E0455)] #[diag(metadata_raw_dylib_only_windows, code = E0455)]
pub struct FrameworkOnlyWindows { pub struct RawDylibOnlyWindows {
#[primary_span] #[primary_span]
pub span: Span, pub span: Span,
} }

2
compiler/rustc_metadata/src/native_libs.rs
View File

@ -151,7 +151,7 @@ fn process_module(&mut self, module: &ForeignModule) {
} }
"raw-dylib" => { "raw-dylib" => {
if !sess.target.is_like_windows { if !sess.target.is_like_windows {
sess.dcx().emit_err(errors::FrameworkOnlyWindows { span }); sess.dcx().emit_err(errors::RawDylibOnlyWindows { span });
} }
NativeLibKind::RawDylib NativeLibKind::RawDylib
} }