Skip to content

Commit

Permalink
Rollup merge of rust-lang#90412 - jyn514:macro-use, r=camelid
Browse files Browse the repository at this point in the history
Remove unnecessary `macro_use`s in rustdoc
  • Loading branch information
matthiaskrgr committed Oct 30, 2021
2 parents e8c897a + b6851ba commit 702f251
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/librustdoc/html/render/context.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/librustdoc/html/render/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>);
Expand Down
1 change: 1 addition & 0 deletions src/librustdoc/html/render/write_shared.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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! {
Expand Down
7 changes: 2 additions & 5 deletions src/librustdoc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 702f251

Please sign in to comment.