Skip to content

Commit d18d5c4

Browse files
committed
Auto merge of rust-lang#77862 - danielhenrymantilla:rustdoc/fix-macros_2_0-paths, r=jyn514,petrochenkov
Rustdoc: Fix macros 2.0 and built-in derives being shown at the wrong path Fixes rust-lang#74355 - ~~waiting on author + draft PR since my code ought to be cleaned up _w.r.t._ the way I avoid the `.unwrap()`s:~~ - ~~dummy items may avoid the first `?`,~~ - ~~but within the module traversal some tests did fail (hence the second `?`), meaning the crate did not possess the exact path of the containing module (`extern` / `impl` blocks maybe? I'll look into that).~~ r? `@jyn514`
2 parents 7f9fa77 + 3db7002 commit d18d5c4

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

std/src/prelude/v1.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ pub use crate::result::Result::{self, Err, Ok};
4141
pub use core::prelude::v1::{
4242
asm, assert, cfg, column, compile_error, concat, concat_idents, env, file, format_args,
4343
format_args_nl, global_asm, include, include_bytes, include_str, line, llvm_asm, log_syntax,
44-
module_path, option_env, stringify, trace_macros,
44+
module_path, option_env, stringify, trace_macros, Clone, Copy, Debug, Default, Eq, Hash, Ord,
45+
PartialEq, PartialOrd,
4546
};
4647

47-
// FIXME: Attribute and derive macros are not documented because for them rustdoc generates
48+
// FIXME: Attribute and internal derive macros are not documented because for them rustdoc generates
4849
// dead links which fail link checker testing.
4950
#[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
5051
#[allow(deprecated)]
5152
#[doc(hidden)]
5253
pub use core::prelude::v1::{
53-
bench, global_allocator, test, test_case, Clone, Copy, Debug, Default, Eq, Hash, Ord,
54-
PartialEq, PartialOrd, RustcDecodable, RustcEncodable,
54+
bench, global_allocator, test, test_case, RustcDecodable, RustcEncodable,
5555
};
5656

5757
#[unstable(

0 commit comments

Comments
 (0)