Skip to content

Commit 7c70314

Browse files
committed
fix fixmes
1 parent 3ab4ab3 commit 7c70314

File tree

6 files changed

+6
-14
lines changed

6 files changed

+6
-14
lines changed

compiler/rustc_metadata/src/rmeta/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ pub(crate) struct CrateRoot {
258258
panic_in_drop_strategy: PanicStrategy,
259259
edition: Edition,
260260

261-
// TODO: these booleans can be replaced by the entries in `externally_implementable_items`
261+
// FIXME(jdonszelmann): these booleans can be replaced by the entries in `externally_implementable_items`
262262
has_global_allocator: bool,
263263
has_alloc_error_handler: bool,
264264
has_default_lib_allocator: bool,

compiler/rustc_middle/src/middle/codegen_fn_attrs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ bitflags::bitflags! {
108108
/// `#[no_mangle]`: an indicator that the function's name should be the same
109109
/// as its symbol.
110110
const NO_MANGLE = 1 << 5;
111-
// TODO: EIIs can replace this, most likely
111+
// FIXME(jdonszelmann): EIIs can replace this, most likely
112112
/// `#[rustc_std_internal_symbol]`: an indicator that this symbol is a
113113
/// "weird symbol" for the standard library in that it has slightly
114114
/// different linkage, visibility, and reachability rules.

compiler/rustc_monomorphize/src/collector.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1555,7 +1555,7 @@ impl<'v> RootCollector<'_, 'v> {
15551555

15561556
self.entry_fn.and_then(|(id, _)| id.as_local()) == Some(def_id)
15571557
|| self.tcx.is_reachable_non_generic(def_id)
1558-
// TODO: EII might remove this:
1558+
// FIXME(jdonszelmann): EII might remove this:
15591559
|| cfa
15601560
.flags
15611561
.contains(CodegenFnAttrFlags::RUSTC_STD_INTERNAL_SYMBOL)

compiler/rustc_monomorphize/src/partitioning.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -773,8 +773,6 @@ fn mono_item_linkage_and_visibility<'tcx>(
773773
// libraries. And shared libraries may later be linked together, both implementing the EII.
774774
// This conflicting implementations may show up. We want to ignore this and just link em
775775
// together anyway. LLVM ensures the last one is the one that's chosen
776-
// TODO: this isn't the problem if they both decided to choose either the default or the
777-
// same explicit impl but if their view on it differs it is a problem!
778776
if let MonoItem::Fn(Instance { def: InstanceKind::EiiShim { weak_linkage, .. }, .. }) =
779777
mono_item
780778
{
@@ -951,7 +949,7 @@ fn mono_item_visibility<'tcx>(
951949
// LLVM internalize them as this decision is left up to the linker to
952950
// omit them, so prevent them from being internalized.
953951
let attrs = tcx.codegen_fn_attrs(def_id);
954-
// TODO: EII might replace this
952+
// FIXME(jdonszelmann): EII might replace this
955953
if attrs.flags.contains(CodegenFnAttrFlags::RUSTC_STD_INTERNAL_SYMBOL) {
956954
*can_be_internalized = false;
957955
}

compiler/rustc_passes/messages.ftl

-6
Original file line numberDiff line numberDiff line change
@@ -775,12 +775,6 @@ passes_unexportable_type_in_interface = {$desc} with `#[export_stable]` attribut
775775
776776
passes_unexportable_type_repr = types with unstable layout are not exportable
777777
778-
passes_undefined_naked_function_abi =
779-
Rust ABI is unsupported in naked functions
780-
781-
passes_unknown_external_lang_item =
782-
unknown external lang item: `{$lang_item}`
783-
784778
passes_unknown_feature =
785779
unknown feature `{$feature}`
786780

compiler/rustc_passes/src/eii.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ pub(crate) fn get_externally_implementable_item_impls<'tcx>(
189189
CRATE_DEF_ID,
190190
Some(Symbol::intern(&format!("EII shim for {decl_did:?}"))),
191191
DefKind::Fn,
192-
None,
193-
&mut DisambiguatorState::new(),
192+
None,
193+
&mut DisambiguatorState::new(),
194194
);
195195

196196
let extern_item_did = decl.eii_extern_item;

0 commit comments

Comments
 (0)