diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-05-23 14:09:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-23 14:09:24 +0200 |
| commit | c9e457dbd68b781ad05958bcd803a7cfbb0b765d (patch) | |
| tree | cb33f877b423ff5ed571c783a7ec6da585494c52 | |
| parent | 337987bf634179241c15780a2886febed9059366 (diff) | |
| parent | 72968e519834213d69989271fd6dfb2cdc64493c (diff) | |
| download | rust-c9e457dbd68b781ad05958bcd803a7cfbb0b765d.tar.gz rust-c9e457dbd68b781ad05958bcd803a7cfbb0b765d.zip | |
Rollup merge of #125409 - tbu-:pr_raw_dylib_only_windows, r=lcnr
Rename `FrameworkOnlyWindows` to `RawDylibOnlyWindows` Frameworks are Apple-specific, no idea why it had "framework" in the name before.
| -rw-r--r-- | compiler/rustc_metadata/messages.ftl | 6 | ||||
| -rw-r--r-- | compiler/rustc_metadata/src/errors.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_metadata/src/native_libs.rs | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/compiler/rustc_metadata/messages.ftl b/compiler/rustc_metadata/messages.ftl index 2f5dfad265c..932603cd6b2 100644 --- a/compiler/rustc_metadata/messages.ftl +++ b/compiler/rustc_metadata/messages.ftl @@ -91,9 +91,6 @@ metadata_found_staticlib = found staticlib `{$crate_name}` instead of rlib or dylib{$add_info} .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 = 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 = 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 = renaming of the library `{$lib_name}` was specified, however this crate contains no `#[link(...)]` attributes referencing this library diff --git a/compiler/rustc_metadata/src/errors.rs b/compiler/rustc_metadata/src/errors.rs index fb0010f2c5d..47d183a0440 100644 --- a/compiler/rustc_metadata/src/errors.rs +++ b/compiler/rustc_metadata/src/errors.rs @@ -142,8 +142,8 @@ pub struct LinkFrameworkApple { } #[derive(Diagnostic)] -#[diag(metadata_framework_only_windows, code = E0455)] -pub struct FrameworkOnlyWindows { +#[diag(metadata_raw_dylib_only_windows, code = E0455)] +pub struct RawDylibOnlyWindows { #[primary_span] pub span: Span, } diff --git a/compiler/rustc_metadata/src/native_libs.rs b/compiler/rustc_metadata/src/native_libs.rs index 58760be921a..1254ebead07 100644 --- a/compiler/rustc_metadata/src/native_libs.rs +++ b/compiler/rustc_metadata/src/native_libs.rs @@ -151,7 +151,7 @@ impl<'tcx> Collector<'tcx> { } "raw-dylib" => { if !sess.target.is_like_windows { - sess.dcx().emit_err(errors::FrameworkOnlyWindows { span }); + sess.dcx().emit_err(errors::RawDylibOnlyWindows { span }); } NativeLibKind::RawDylib } |
