Skip to content

Commit 5635a39

Browse files
Simplify cleaning foreign fns in rustdoc
1 parent e6db769 commit 5635a39

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

src/librustdoc/clean/mod.rs

+4-10
Original file line numberDiff line numberDiff line change
@@ -3094,16 +3094,10 @@ fn clean_maybe_renamed_foreign_item<'tcx>(
30943094
let def_id = item.owner_id.to_def_id();
30953095
cx.with_param_env(def_id, |cx| {
30963096
let kind = match item.kind {
3097-
hir::ForeignItemKind::Fn(decl, names, generics, safety) => {
3098-
let (generics, decl) = enter_impl_trait(cx, |cx| {
3099-
// NOTE: generics must be cleaned before args
3100-
let generics = clean_generics(generics, cx);
3101-
let args = clean_args_from_types_and_names(cx, decl.inputs, names);
3102-
let decl = clean_fn_decl_with_args(cx, decl, None, args);
3103-
(generics, decl)
3104-
});
3105-
ForeignFunctionItem(Box::new(Function { decl, generics }), safety)
3106-
}
3097+
hir::ForeignItemKind::Fn(sig, names, generics) => ForeignFunctionItem(
3098+
clean_function(cx, &sig, generics, FunctionArgs::Names(names)),
3099+
sig.header.safety,
3100+
),
31073101
hir::ForeignItemKind::Static(ty, mutability, safety) => ForeignStaticItem(
31083102
Static { type_: Box::new(clean_ty(ty, cx)), mutability, expr: None },
31093103
safety,

tests/ui/rfcs/rfc-2627-raw-dylib/unsupported-abi.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: ABI not supported by `#[link(kind = "raw-dylib")]` on this architecture
22
--> $DIR/unsupported-abi.rs:6:5
33
|
44
LL | fn f(x: i32);
5-
| ^^^^^^^^^^^^
5+
| ^^^^^^^^^^^^^
66

77
error: aborting due to 1 previous error
88

0 commit comments

Comments
 (0)