librustdoc: Use correct heading levels.

compiler/rustc_error_codes/src/error_codes/E0001.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 This error suggests that the expression arm corresponding to the noted pattern
 will never be reached as for all possible values of the expression being

compiler/rustc_error_codes/src/error_codes/E0002.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 This error indicates that an empty match expression is invalid because the type
 it is matching on is non-empty (there exist values of this type). In safe code

compiler/rustc_error_codes/src/error_codes/E0007.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 This error indicates that the bindings in a match arm would require a value to
 be moved into more than one location, thus violating unique ownership. Code

compiler/rustc_error_codes/src/error_codes/E0009.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 In a pattern, all values that don't implement the `Copy` trait have to be bound
 the same way. The goal here is to avoid binding simultaneously by-move and

compiler/rustc_error_codes/src/error_codes/E0014.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 Constants can only be initialized by a constant value or, in a future
 version of Rust, a call to a const function. This error indicates the use

compiler/rustc_error_codes/src/error_codes/E0073.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 You cannot define a struct (or enum) `Foo` that requires an instance of `Foo`
 in order to make a new `Foo` value. This is because there would be no way a

compiler/rustc_error_codes/src/error_codes/E0074.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 When using the `#[simd]` attribute on a tuple struct, the components of the
 tuple struct must all be of a concrete, nongeneric type so the compiler can

compiler/rustc_error_codes/src/error_codes/E0087.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 Too many type arguments were supplied for a function. For example:
 

compiler/rustc_error_codes/src/error_codes/E0088.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 You gave too many lifetime arguments. Erroneous code example:
 

compiler/rustc_error_codes/src/error_codes/E0089.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 Too few type arguments were supplied for a function. For example:
 

compiler/rustc_error_codes/src/error_codes/E0090.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 You gave too few lifetime arguments. Example:
 

compiler/rustc_error_codes/src/error_codes/E0110.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 You tried to provide a lifetime to a type which doesn't need it.
 See `E0109` for more details.

compiler/rustc_error_codes/src/error_codes/E0136.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 More than one `main` function was found.
 

compiler/rustc_error_codes/src/error_codes/E0137.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 More than one function was declared with the `#[main]` attribute.
 

compiler/rustc_error_codes/src/error_codes/E0139.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 There are various restrictions on transmuting between types in Rust; for example
 types being transmuted must have the same size. To apply all these restrictions,

compiler/rustc_error_codes/src/error_codes/E0154.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 Imports (`use` statements) are not allowed after non-item statements, such as
 variable declarations and expression statements.

compiler/rustc_error_codes/src/error_codes/E0162.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 An `if let` pattern attempts to match the pattern, and enters the body if the
 match was successful. If the match is irrefutable (when it cannot fail to

compiler/rustc_error_codes/src/error_codes/E0165.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 A `while let` pattern attempts to match the pattern, and enters the body if the
 match was successful. If the match is irrefutable (when it cannot fail to

compiler/rustc_error_codes/src/error_codes/E0193.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 `where` clauses must use generic type parameters: it does not make sense to use
 them otherwise. An example causing this error:

compiler/rustc_error_codes/src/error_codes/E0205.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 An attempt to implement the `Copy` trait for an enum failed because one of the
 variants does not implement `Copy`. To fix this, you must implement `Copy` for

compiler/rustc_error_codes/src/error_codes/E0211.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 You used a function or type which doesn't fit the requirements for where it was
 used. Erroneous code examples:

compiler/rustc_error_codes/src/error_codes/E0243.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 This error indicates that not enough type parameters were found in a type or
 trait.

compiler/rustc_error_codes/src/error_codes/E0244.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 This error indicates that too many type parameters were found in a type or
 trait.

compiler/rustc_error_codes/src/error_codes/E0251.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 Two items of the same name cannot be imported without rebinding one of the
 items under a new local name.

compiler/rustc_error_codes/src/error_codes/E0256.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 You can't import a type or module when the name of the item being imported is
 the same as another type or submodule defined in the module.

compiler/rustc_error_codes/src/error_codes/E0281.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 You tried to supply a type which doesn't implement some trait in a location
 which expected that trait. This error typically occurs when working with

compiler/rustc_error_codes/src/error_codes/E0297.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 Patterns used to bind names must be irrefutable. That is, they must guarantee
 that a name will be extracted in all cases. Instead of pattern matching the

compiler/rustc_error_codes/src/error_codes/E0301.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 Mutable borrows are not allowed in pattern guards, because matching cannot have
 side effects. Side effects could alter the matched object or the environment

compiler/rustc_error_codes/src/error_codes/E0302.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 Assignments are not allowed in pattern guards, because matching cannot have
 side effects. Side effects could alter the matched object or the environment

compiler/rustc_error_codes/src/error_codes/E0303.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 Sub-bindings, e.g. `ref x @ Some(ref y)` are now allowed under
 `#![feature(bindings_after_at)]` and checked to make sure that

compiler/rustc_error_codes/src/error_codes/E0329.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 An attempt was made to access an associated constant through either a generic
 type parameter or `Self`. This is not supported yet. An example causing this

compiler/rustc_error_codes/src/error_codes/E0383.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 This error occurs when an attempt is made to partially reinitialize a
 structure that is currently uninitialized.

compiler/rustc_error_codes/src/error_codes/E0386.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 This error occurs when an attempt is made to mutate the target of a mutable
 reference stored inside an immutable container.

compiler/rustc_error_codes/src/error_codes/E0387.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 This error occurs when an attempt is made to mutate or mutably reference data
 that a closure has captured immutably.

compiler/rustc_error_codes/src/error_codes/E0388.md

@@ -1 +1 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.

compiler/rustc_error_codes/src/error_codes/E0389.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 An attempt was made to mutate data using a non-mutable reference. This
 commonly occurs when attempting to assign to a non-mutable reference of a

compiler/rustc_error_codes/src/error_codes/E0398.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 In Rust 1.3, the default object lifetime bounds are expected to change, as
 described in [RFC 1156]. You are getting a warning because the compiler

compiler/rustc_error_codes/src/error_codes/E0399.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler
+### Note: this error code is no longer emitted by the compiler
 
 You implemented a trait, overriding one or more of its associated types but did
 not reimplement its default methods.

compiler/rustc_error_codes/src/error_codes/E0439.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 The length of the platform-intrinsic function `simd_shuffle` wasn't specified.
 

compiler/rustc_error_codes/src/error_codes/E0447.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 The `pub` keyword was used inside a function.
 

compiler/rustc_error_codes/src/error_codes/E0448.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 The `pub` keyword was used inside a public enum.
 

compiler/rustc_error_codes/src/error_codes/E0497.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 A stability attribute was used outside of the standard library.
 

compiler/rustc_error_codes/src/error_codes/E0504.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 This error occurs when an attempt is made to move a borrowed variable into a
 closure.

compiler/rustc_error_codes/src/error_codes/E0595.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 Closures cannot mutate immutable captured variables.
 

compiler/rustc_error_codes/src/error_codes/E0619.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 The type-checker needed to know the type of an expression, but that type had not
 yet been inferred.

compiler/rustc_error_codes/src/error_codes/E0633.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 The `unwind` attribute was malformed.
 

compiler/rustc_error_codes/src/error_codes/E0665.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 The `Default` trait was derived on an enum.
 

compiler/rustc_error_codes/src/error_codes/E0671.md

@@ -1,4 +1,4 @@
-#### Note: this error code is no longer emitted by the compiler.
+### Note: this error code is no longer emitted by the compiler.
 
 Const parameters cannot depend on type parameters.
 The following is therefore invalid:

src/librustdoc/externalfiles.rs

@@ -39,14 +39,14 @@ impl ExternalHtml {
         let bc = format!(
             "{}{}",
             bc,
-            Markdown(&m_bc, &[], id_map, codes, edition, playground).into_string()
+            Markdown(&m_bc, &[], id_map, codes, edition, playground, 0).into_string()
         );
         let ac = load_external_files(after_content, diag)?;
         let m_ac = load_external_files(md_after_content, diag)?;
         let ac = format!(
             "{}{}",
             ac,
-            Markdown(&m_ac, &[], id_map, codes, edition, playground).into_string()
+            Markdown(&m_ac, &[], id_map, codes, edition, playground, 0).into_string()
         );
         Some(ExternalHtml { in_header: ih, before_content: bc, after_content: ac })
     }

src/librustdoc/html/markdown.rs

@@ -12,7 +12,7 @@
 //!
 //! let s = "My *markdown* _text_";
 //! let mut id_map = IdMap::new();
-//! let md = Markdown(s, &[], &mut id_map, ErrorCodes::Yes, Edition::Edition2015, &None);
+//! let md = Markdown(s, &[], &mut id_map, ErrorCodes::Yes, Edition::Edition2015, &None, 0);
 //! let html = md.into_string();
 //! // ... something using html
 //! ```
@@ -47,6 +47,8 @@ use pulldown_cmark::{
 #[cfg(test)]
 mod tests;
 
+const MAX_HEADER_LEVEL: u32 = 6;
+
 /// Options for rendering Markdown in the main body of documentation.
 pub(crate) fn main_body_opts() -> Options {
     Options::ENABLE_TABLES
@@ -78,6 +80,7 @@ pub struct Markdown<'a>(
     /// Default edition to use when parsing doctests (to add a `fn main`).
     pub Edition,
     pub &'a Option<Playground>,
+    pub u32,
 );
 /// A tuple struct like `Markdown` that renders the markdown with a table of contents.
 crate struct MarkdownWithToc<'a>(
@@ -489,11 +492,12 @@ struct HeadingLinks<'a, 'b, 'ids, I> {
     toc: Option<&'b mut TocBuilder>,
     buf: VecDeque<SpannedEvent<'a>>,
     id_map: &'ids mut IdMap,
+    level: u32,
 }
 
 impl<'a, 'b, 'ids, I> HeadingLinks<'a, 'b, 'ids, I> {
-    fn new(iter: I, toc: Option<&'b mut TocBuilder>, ids: &'ids mut IdMap) -> Self {
-        HeadingLinks { inner: iter, toc, buf: VecDeque::new(), id_map: ids }
+    fn new(iter: I, toc: Option<&'b mut TocBuilder>, ids: &'ids mut IdMap, level: u32) -> Self {
+        HeadingLinks { inner: iter, toc, buf: VecDeque::new(), id_map: ids, level }
     }
 }
 
@@ -530,6 +534,7 @@ impl<'a, 'b, 'ids, I: Iterator<Item = SpannedEvent<'a>>> Iterator
                 self.buf.push_front((Event::Html(format!("{} ", sec).into()), 0..0));
             }
 
+            let level = std::cmp::min(level + self.level + 1, MAX_HEADER_LEVEL);
             self.buf.push_back((Event::Html(format!("</a></h{}>", level).into()), 0..0));
 
             let start_tags = format!(
@@ -1005,7 +1010,7 @@ impl LangString {
 
 impl Markdown<'_> {
     pub fn into_string(self) -> String {
-        let Markdown(md, links, mut ids, codes, edition, playground) = self;
+        let Markdown(md, links, mut ids, codes, edition, playground, level) = self;
 
         // This is actually common enough to special-case
         if md.is_empty() {
@@ -1026,7 +1031,7 @@ impl Markdown<'_> {
 
         let mut s = String::with_capacity(md.len() * 3 / 2);
 
-        let p = HeadingLinks::new(p, None, &mut ids);
+        let p = HeadingLinks::new(p, None, &mut ids, level);
         let p = Footnotes::new(p);
         let p = LinkReplacer::new(p.map(|(ev, _)| ev), links);
         let p = TableWrapper::new(p);
@@ -1048,7 +1053,7 @@ impl MarkdownWithToc<'_> {
         let mut toc = TocBuilder::new();
 
         {
-            let p = HeadingLinks::new(p, Some(&mut toc), &mut ids);
+            let p = HeadingLinks::new(p, Some(&mut toc), &mut ids, 0);
             let p = Footnotes::new(p);
             let p = TableWrapper::new(p.map(|(ev, _)| ev));
             let p = CodeBlocks::new(p, codes, edition, playground);
@@ -1077,7 +1082,7 @@ impl MarkdownHtml<'_> {
 
         let mut s = String::with_capacity(md.len() * 3 / 2);
 
-        let p = HeadingLinks::new(p, None, &mut ids);
+        let p = HeadingLinks::new(p, None, &mut ids, 0);
         let p = Footnotes::new(p);
         let p = TableWrapper::new(p.map(|(ev, _)| ev));
         let p = CodeBlocks::new(p, codes, edition, playground);
@@ -1295,7 +1300,7 @@ crate fn markdown_links(md: &str) -> Vec<MarkdownLink> {
     // There's no need to thread an IdMap through to here because
     // the IDs generated aren't going to be emitted anywhere.
     let mut ids = IdMap::new();
-    let iter = Footnotes::new(HeadingLinks::new(p, None, &mut ids));
+    let iter = Footnotes::new(HeadingLinks::new(p, None, &mut ids, 0));
 
     for ev in iter {
         if let Event::Start(Tag::Link(kind, dest, _)) = ev.0 {