diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-10-30 14:37:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-30 14:37:04 +0200 |
| commit | 19b5b0f8fbc2034993f39bdf60005a706d11a75d (patch) | |
| tree | 93b9c9909310c68984b50f5a584dec10aeae5034 /src | |
| parent | f9111e0336ee595961069fc5b9126c435968894b (diff) | |
| parent | b6851ba3c9eccfb1def7fdb5e4c64edcad55e612 (diff) | |
| download | rust-19b5b0f8fbc2034993f39bdf60005a706d11a75d.tar.gz rust-19b5b0f8fbc2034993f39bdf60005a706d11a75d.zip | |
Rollup merge of #90412 - jyn514:macro-use, r=camelid
Remove unnecessary `macro_use`s in rustdoc
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustdoc/html/render/context.rs | 4 | ||||
| -rw-r--r-- | src/librustdoc/html/render/mod.rs | 1 | ||||
| -rw-r--r-- | src/librustdoc/html/render/write_shared.rs | 1 | ||||
| -rw-r--r-- | src/librustdoc/lib.rs | 7 |
4 files changed, 6 insertions, 7 deletions
diff --git a/src/librustdoc/html/render/context.rs b/src/librustdoc/html/render/context.rs index 0e29cc85f9e..1ce6a5c00be 100644 --- a/src/librustdoc/html/render/context.rs +++ b/src/librustdoc/html/render/context.rs @@ -22,8 +22,7 @@ use super::{ BASIC_KEYWORDS, }; -use crate::clean; -use crate::clean::ExternalCrate; +use crate::clean::{self, ExternalCrate}; use crate::config::RenderOptions; use crate::docfs::{DocFS, PathError}; use crate::error::Error; @@ -35,6 +34,7 @@ use crate::html::format::Buffer; use crate::html::markdown::{self, plain_text_summary, ErrorCodes, IdMap}; use crate::html::{layout, sources}; use crate::scrape_examples::AllCallLocations; +use crate::try_err; /// Major driving force in all rustdoc rendering. This contains information /// about where in the tree-like hierarchy rendering is occurring and controls diff --git a/src/librustdoc/html/render/mod.rs b/src/librustdoc/html/render/mod.rs index 68b2dd1536b..e2ecf20fe84 100644 --- a/src/librustdoc/html/render/mod.rs +++ b/src/librustdoc/html/render/mod.rs @@ -77,6 +77,7 @@ use crate::html::highlight; use crate::html::markdown::{HeadingOffset, Markdown, MarkdownHtml, MarkdownSummaryLine}; use crate::html::sources; use crate::scrape_examples::CallData; +use crate::try_none; /// A pair of name and its optional document. crate type NameDoc = (String, Option<String>); diff --git a/src/librustdoc/html/render/write_shared.rs b/src/librustdoc/html/render/write_shared.rs index 34f1b4cd684..27277015cd1 100644 --- a/src/librustdoc/html/render/write_shared.rs +++ b/src/librustdoc/html/render/write_shared.rs @@ -17,6 +17,7 @@ use crate::config::{EmitType, RenderOptions}; use crate::docfs::PathError; use crate::error::Error; use crate::html::{layout, static_files}; +use crate::{try_err, try_none}; static FILES_UNVERSIONED: Lazy<FxHashMap<&str, &[u8]>> = Lazy::new(|| { map! { diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs index 93dffc27659..b50fbf58bae 100644 --- a/src/librustdoc/lib.rs +++ b/src/librustdoc/lib.rs @@ -103,17 +103,14 @@ macro_rules! map { }} } -#[macro_use] -mod externalfiles; - mod clean; mod config; mod core; mod docfs; +mod doctest; mod doctree; -#[macro_use] mod error; -mod doctest; +mod externalfiles; mod fold; mod formats; // used by the error-index generator, so it needs to be public |
