Skip to content

Commit 7d456f7

Browse files
authored
Rollup merge of #94894 - camelid:into, r=nagisa
Remove needless use of `Into`
2 parents c738243 + cc5cf86 commit 7d456f7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/librustdoc/clean/inline.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ fn merge_attrs(
327327
/// Inline an `impl`, inherent or of a trait. The `did` must be for an `impl`.
328328
crate fn build_impl(
329329
cx: &mut DocContext<'_>,
330-
parent_module: impl Into<Option<DefId>>,
330+
parent_module: Option<DefId>,
331331
did: DefId,
332332
attrs: Option<Attrs<'_>>,
333333
ret: &mut Vec<clean::Item>,
@@ -478,7 +478,7 @@ crate fn build_impl(
478478
record_extern_trait(cx, did);
479479
}
480480

481-
let (merged_attrs, cfg) = merge_attrs(cx, parent_module.into(), load_attrs(cx, did), attrs);
481+
let (merged_attrs, cfg) = merge_attrs(cx, parent_module, load_attrs(cx, did), attrs);
482482
trace!("merged_attrs={:?}", merged_attrs);
483483

484484
trace!(

0 commit comments

Comments
 (0)