mirror
/
rustc-dev-guide
mirror of https://github.com/rust-lang/rustc-dev-guide.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename typeck to hir_analysis (#1475) 

Co-authored-by: mejrs <>
This commit is contained in:
Bruno Kolenbrander 2022-10-04 14:22:00 +02:00 committed by GitHub
parent 14d6444fe5
commit c86cf1dd7c
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/diagnostics/diagnostic-structs.md
View File

@ -17,13 +17,13 @@ shown below:
```rust,ignore ```rust,ignore
#[derive(Diagnostic)] #[derive(Diagnostic)]
#[diag(typeck::field_already_declared, code = "E0124")] #[diag(hir_analysis::field_already_declared, code = "E0124")]
pub struct FieldAlreadyDeclared { pub struct FieldAlreadyDeclared {
pub field_name: Ident, pub field_name: Ident,
#[primary_span] #[primary_span]
#[label] #[label]
pub span: Span, pub span: Span,
#[label(typeck::previous_decl_label)] #[label(hir_analysis::previous_decl_label)]
pub prev_span: Span, pub prev_span: Span,
} }
``` ```
@ -47,13 +47,13 @@ In our example, the Fluent message for the "field already declared" diagnostic
looks like this: looks like this:
```fluent ```fluent
typeck_field_already_declared = hir_analysis_field_already_declared =
field `{$field_name}` is already declared field `{$field_name}` is already declared
.label = field already declared .label = field already declared
.previous_decl_label = `{$field_name}` first declared here .previous_decl_label = `{$field_name}` first declared here
``` ```
`typeck_field_already_declared` is the slug from our example and is followed `hir_analysis_field_already_declared` is the slug from our example and is followed
by the diagnostic message. by the diagnostic message.
Every field of the `Diagnostic` which does not have an annotation is Every field of the `Diagnostic` which does not have an annotation is
@ -73,7 +73,7 @@ type `Span`. Applying any of these attributes will create the corresponding
subdiagnostic with that `Span`. These attributes will look for their subdiagnostic with that `Span`. These attributes will look for their
diagnostic message in a Fluent attribute attached to the primary Fluent diagnostic message in a Fluent attribute attached to the primary Fluent
message. In our example, `#[label]` will look for message. In our example, `#[label]` will look for
`typeck_field_already_declared.label` (which has the message "field already `hir_analysis_field_already_declared.label` (which has the message "field already
declared"). If there is more than one subdiagnostic of the same type, then declared"). If there is more than one subdiagnostic of the same type, then
these attributes can also take a value that is the attribute name to look for these attributes can also take a value that is the attribute name to look for
(e.g. `previous_decl_label` in our example). (e.g. `previous_decl_label` in our example).
@ -113,15 +113,15 @@ In the end, the `Diagnostic` derive will generate an implementation of
```rust,ignore ```rust,ignore
impl IntoDiagnostic<'_> for FieldAlreadyDeclared { impl IntoDiagnostic<'_> for FieldAlreadyDeclared {
fn into_diagnostic(self, handler: &'_ rustc_errors::Handler) -> DiagnosticBuilder<'_> { fn into_diagnostic(self, handler: &'_ rustc_errors::Handler) -> DiagnosticBuilder<'_> {
let mut diag = handler.struct_err(rustc_errors::fluent::typeck::field_already_declared); let mut diag = handler.struct_err(rustc_errors::fluent::hir_analysis::field_already_declared);
diag.set_span(self.span); diag.set_span(self.span);
diag.span_label( diag.span_label(
self.span, self.span,
rustc_errors::fluent::typeck::label rustc_errors::fluent::hir_analysis::label
); );
diag.span_label( diag.span_label(
self.prev_span, self.prev_span,
rustc_errors::fluent::typeck::previous_decl_label rustc_errors::fluent::hir_analysis::previous_decl_label
); );
diag diag
} }
@ -154,9 +154,9 @@ following attributes:
- A path to an item in `rustc_errors::fluent`. Always in a module starting - A path to an item in `rustc_errors::fluent`. Always in a module starting
with a Fluent resource name (which is typically the name of the crate with a Fluent resource name (which is typically the name of the crate
that the diagnostic is from), e.g. that the diagnostic is from), e.g.
`rustc_errors::fluent::typeck::field_already_declared` `rustc_errors::fluent::hir_analysis::field_already_declared`
(`rustc_errors::fluent` is implicit in the attribute, so just (`rustc_errors::fluent` is implicit in the attribute, so just
`typeck::field_already_declared`). `hir_analysis::field_already_declared`).
- See [translation documentation](./translation.md). - See [translation documentation](./translation.md).
- `code = "..."` (_Optional_) - `code = "..."` (_Optional_)
- Specifies the error code. - Specifies the error code.
@ -194,11 +194,11 @@ following attributes:
- A path to an item in `rustc_errors::fluent`. Always in a module starting - A path to an item in `rustc_errors::fluent`. Always in a module starting
with a Fluent resource name (which is typically the name of the crate with a Fluent resource name (which is typically the name of the crate
that the diagnostic is from), e.g. that the diagnostic is from), e.g.
`rustc_errors::fluent::typeck::field_already_declared` `rustc_errors::fluent::hir_analysis::field_already_declared`
(`rustc_errors::fluent` is implicit in the attribute, so just (`rustc_errors::fluent` is implicit in the attribute, so just
`typeck::field_already_declared`). Fluent attributes for all messages `hir_analysis::field_already_declared`). Fluent attributes for all messages
exist as top-level items in that module (so `typeck_message.attr` is just exist as top-level items in that module (so `hir_analysis_message.attr` is just
`typeck::attr`). `hir_analysis::attr`).
- See [translation documentation](./translation.md). - See [translation documentation](./translation.md).
- Defaults to `rustc_errors::fluent::_subdiag::suggestion` (or - Defaults to `rustc_errors::fluent::_subdiag::suggestion` (or
- `.suggestion` in Fluent). - `.suggestion` in Fluent).
@ -233,12 +233,12 @@ shown below:
```rust ```rust
#[derive(Subdiagnostic)] #[derive(Subdiagnostic)]
pub enum ExpectedReturnTypeLabel<'tcx> { pub enum ExpectedReturnTypeLabel<'tcx> {
#[label(typeck::expected_default_return_type)] #[label(hir_analysis::expected_default_return_type)]
Unit { Unit {
#[primary_span] #[primary_span]
span: Span, span: Span,
}, },
#[label(typeck::expected_return_type)] #[label(hir_analysis::expected_return_type)]
Other { Other {
#[primary_span] #[primary_span]
span: Span, span: Span,
@ -268,9 +268,9 @@ In our example, the Fluent message for the "expected return type" label
looks like this: looks like this:
```fluent ```fluent
typeck_expected_default_return_type = expected `()` because of default return type hir_analysis_expected_default_return_type = expected `()` because of default return type
typeck_expected_return_type = expected `{$expected}` because of return type hir_analysis_expected_return_type = expected `{$expected}` because of return type
``` ```
Using the `#[primary_span]` attribute on a field (with type `Span`) will denote Using the `#[primary_span]` attribute on a field (with type `Span`) will denote
@ -315,11 +315,11 @@ impl<'tcx> AddToDiagnostic for ExpectedReturnTypeLabel<'tcx> {
use rustc_errors::{Applicability, IntoDiagnosticArg}; use rustc_errors::{Applicability, IntoDiagnosticArg};
match self { match self {
ExpectedReturnTypeLabel::Unit { span } => { ExpectedReturnTypeLabel::Unit { span } => {
diag.span_label(span, rustc_errors::fluent::typeck::expected_default_return_type) diag.span_label(span, rustc_errors::fluent::hir_analysis::expected_default_return_type)
} }
ExpectedReturnTypeLabel::Other { span, expected } => { ExpectedReturnTypeLabel::Other { span, expected } => {
diag.set_arg("expected", expected); diag.set_arg("expected", expected);
diag.span_label(span, rustc_errors::fluent::typeck::expected_return_type) diag.span_label(span, rustc_errors::fluent::hir_analysis::expected_return_type)
} }
} }
@ -345,9 +345,9 @@ diagnostic struct.
- A path to an item in `rustc_errors::fluent`. Always in a module starting - A path to an item in `rustc_errors::fluent`. Always in a module starting
with a Fluent resource name (which is typically the name of the crate with a Fluent resource name (which is typically the name of the crate
that the diagnostic is from), e.g. that the diagnostic is from), e.g.
`rustc_errors::fluent::typeck::field_already_declared` `rustc_errors::fluent::hir_analysis::field_already_declared`
(`rustc_errors::fluent` is implicit in the attribute, so just (`rustc_errors::fluent` is implicit in the attribute, so just
`typeck::field_already_declared`). `hir_analysis::field_already_declared`).
- See [translation documentation](./translation.md). - See [translation documentation](./translation.md).
- `#[suggestion{,_hidden,_short,_verbose}(slug, code = "...", applicability = "...")]` - `#[suggestion{,_hidden,_short,_verbose}(slug, code = "...", applicability = "...")]`
- _Applied to struct or enum variant. Mutually exclusive with struct/enum variant attributes._ - _Applied to struct or enum variant. Mutually exclusive with struct/enum variant attributes._
@ -357,11 +357,11 @@ diagnostic struct.
- A path to an item in `rustc_errors::fluent`. Always in a module starting - A path to an item in `rustc_errors::fluent`. Always in a module starting
with a Fluent resource name (which is typically the name of the crate with a Fluent resource name (which is typically the name of the crate
that the diagnostic is from), e.g. that the diagnostic is from), e.g.
`rustc_errors::fluent::typeck::field_already_declared` `rustc_errors::fluent::hir_analysis::field_already_declared`
(`rustc_errors::fluent` is implicit in the attribute, so just (`rustc_errors::fluent` is implicit in the attribute, so just
`typeck::field_already_declared`). Fluent attributes for all messages `hir_analysis::field_already_declared`). Fluent attributes for all messages
exist as top-level items in that module (so `typeck_message.attr` is just exist as top-level items in that module (so `hir_analysis_message.attr` is just
`typeck::attr`). `hir_analysis::attr`).
- See [translation documentation](./translation.md). - See [translation documentation](./translation.md).
- Defaults to `rustc_errors::fluent::_subdiag::suggestion` (or - Defaults to `rustc_errors::fluent::_subdiag::suggestion` (or
- `.suggestion` in Fluent). - `.suggestion` in Fluent).
@ -399,9 +399,9 @@ to multipart suggestions)
- _Applied to any field._ - _Applied to any field._
- Prevents the field from being provided as a diagnostic argument. - Prevents the field from being provided as a diagnostic argument.
[defn]: https://github.com/rust-lang/rust/blob/bbe9d27b8ff36da56638aa43d6d0cdfdf89a4e57/compiler/rustc_typeck/src/errors.rs#L65-L74 [defn]: https://github.com/rust-lang/rust/blob/6201eabde85db854c1ebb57624be5ec699246b50/compiler/rustc_hir_analysis/src/errors.rs#L68-L77
[use]: https://github.com/rust-lang/rust/blob/eb82facb1626166188d49599a3313fc95201f556/compiler/rustc_typeck/src/collect.rs#L981-L985 [use]: https://github.com/rust-lang/rust/blob/f1112099eba41abadb6f921df7edba70affe92c5/compiler/rustc_hir_analysis/src/collect.rs#L823-L827
[subdiag_defn]: https://github.com/rust-lang/rust/blob/e70c60d34b9783a2fd3171d88d248c2e0ec8ecdd/compiler/rustc_typeck/src/errors.rs#L220-L233 [subdiag_defn]: https://github.com/rust-lang/rust/blob/f1112099eba41abadb6f921df7edba70affe92c5/compiler/rustc_hir_analysis/src/errors.rs#L221-L234
[subdiag_use_1]: https://github.com/rust-lang/rust/blob/e70c60d34b9783a2fd3171d88d248c2e0ec8ecdd/compiler/rustc_typeck/src/check/fn_ctxt/suggestions.rs#L556-L560 [subdiag_use_1]: https://github.com/rust-lang/rust/blob/f1112099eba41abadb6f921df7edba70affe92c5/compiler/rustc_hir_analysis/src/check/fn_ctxt/suggestions.rs#L670-L674
[subdiag_use_2]: https://github.com/rust-lang/rust/blob/e70c60d34b9783a2fd3171d88d248c2e0ec8ecdd/compiler/rustc_typeck/src/check/fn_ctxt/suggestions.rs#L575-L579 [subdiag_use_2]: https://github.com/rust-lang/rust/blob/f1112099eba41abadb6f921df7edba70affe92c5/compiler/rustc_hir_analysis/src/check/fn_ctxt/suggestions.rs#L704-L707