Skip to content

Commit 72968e5

Browse files
committed
Rename FrameworkOnlyWindows to RawDylibOnlyWindows
Frameworks are Apple-specific, no idea why it had "framework" in the name before.
1 parent f0038a7 commit 72968e5

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

compiler/rustc_metadata/messages.ftl

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,6 @@ metadata_found_staticlib =
9191
found staticlib `{$crate_name}` instead of rlib or dylib{$add_info}
9292
.help = please recompile that crate using --crate-type lib
9393
94-
metadata_framework_only_windows =
95-
link kind `raw-dylib` is only supported on Windows targets
96-
9794
metadata_global_alloc_required =
9895
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
9996
@@ -233,6 +230,9 @@ metadata_profiler_builtins_needs_core =
233230
metadata_raw_dylib_no_nul =
234231
link name must not contain NUL characters if link kind is `raw-dylib`
235232
233+
metadata_raw_dylib_only_windows =
234+
link kind `raw-dylib` is only supported on Windows targets
235+
236236
metadata_renaming_no_link =
237237
renaming of the library `{$lib_name}` was specified, however this crate contains no `#[link(...)]` attributes referencing this library
238238

compiler/rustc_metadata/src/errors.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ pub struct LinkFrameworkApple {
142142
}
143143

144144
#[derive(Diagnostic)]
145-
#[diag(metadata_framework_only_windows, code = E0455)]
146-
pub struct FrameworkOnlyWindows {
145+
#[diag(metadata_raw_dylib_only_windows, code = E0455)]
146+
pub struct RawDylibOnlyWindows {
147147
#[primary_span]
148148
pub span: Span,
149149
}

compiler/rustc_metadata/src/native_libs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ impl<'tcx> Collector<'tcx> {
151151
}
152152
"raw-dylib" => {
153153
if !sess.target.is_like_windows {
154-
sess.dcx().emit_err(errors::FrameworkOnlyWindows { span });
154+
sess.dcx().emit_err(errors::RawDylibOnlyWindows { span });
155155
}
156156
NativeLibKind::RawDylib
157157
}

0 commit comments

Comments
 (0)