Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

librustdoc: Use correct heading levels. #89506

Merged
merged 8 commits into from
Oct 6, 2021
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0001.md
Original file line number Diff line number Diff line change
@@ -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.
GuillaumeGomez marked this conversation as resolved.
Show resolved Hide resolved

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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0002.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0007.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0009.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0014.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0073.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0074.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0087.md
Original file line number Diff line number Diff line change
@@ -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:

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0088.md
Original file line number Diff line number Diff line change
@@ -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:

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0089.md
Original file line number Diff line number Diff line change
@@ -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:

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0090.md
Original file line number Diff line number Diff line change
@@ -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:

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0110.md
Original file line number Diff line number Diff line change
@@ -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.
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0136.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0137.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0139.md
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0154.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0162.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0165.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0193.md
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0205.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0211.md
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0243.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0244.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0251.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0256.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0281.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0297.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0301.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0302.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0303.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0329.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0383.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0386.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0387.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0388.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
#### Note: this error code is no longer emitted by the compiler.
### Note: this error code is no longer emitted by the compiler.
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0389.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0398.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0399.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0439.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0447.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0448.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0497.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0504.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0595.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0619.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0633.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0665.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_error_codes/src/error_codes/E0671.md
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
24 changes: 21 additions & 3 deletions src/librustdoc/externalfiles.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::html::markdown::{ErrorCodes, IdMap, Markdown, Playground};
use crate::html::markdown::{ErrorCodes, HeadingOffset, IdMap, Markdown, Playground};
use crate::rustc_span::edition::Edition;
use std::fs;
use std::path::Path;
Expand Down Expand Up @@ -39,14 +39,32 @@ impl ExternalHtml {
let bc = format!(
"{}{}",
bc,
Markdown(&m_bc, &[], id_map, codes, edition, playground).into_string()
Markdown {
content: &m_bc,
links: &[],
ids: id_map,
error_codes: codes,
edition,
playground,
heading_offset: HeadingOffset::H2,
GuillaumeGomez marked this conversation as resolved.
Show resolved Hide resolved
}
.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 {
content: &m_ac,
links: &[],
ids: id_map,
error_codes: codes,
edition,
playground,
heading_offset: HeadingOffset::H2,
}
.into_string()
);
Some(ExternalHtml { in_header: ih, before_content: bc, after_content: ac })
}
Expand Down
Loading