user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #151224 - matthiaskrgr:rollup-SLK4owB, r=matthiaskrgr

Browse source 
Rollup of 4 pull requests

Successful merges:

 - rust-lang/rust#151196 (Ship LLVM (`rust-dev`) in fast try builds again)
 - rust-lang/rust#151198 (Add an additional help note to the ambiguity lint error)
 - rust-lang/rust#151215 (Add missing closing brackets to THIR output.)
 - rust-lang/rust#151218 (compiletest: Add `AuxCrate` struct with docs.)

r? @ghost
This commit is contained in:
bors 2026-01-16 20:33:57 +00:00
commit f6a07efc81
23 changed files with 1067 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/rustc_mir_build/src/thir/print.rs
View file

@ -618,8 +618,8 @@ impl<'a, 'tcx> ThirPrinter<'a, 'tcx> {
print_indented!(self, format!("args: {:?}", adt_expr.args), depth_lvl + 1); print_indented!(self, format!("args: {:?}", adt_expr.args), depth_lvl + 1);
print_indented!(self, format!("user_ty: {:?}", adt_expr.user_ty), depth_lvl + 1); print_indented!(self, format!("user_ty: {:?}", adt_expr.user_ty), depth_lvl + 1);
for (i, field_expr) in adt_expr.fields.iter().enumerate() { for field_expr in adt_expr.fields.iter() {
print_indented!(self, format!("field {}:", i), depth_lvl + 1); print_indented!(self, format!("field {}:", field_expr.name.as_u32()), depth_lvl + 1);
self.print_expr(field_expr.expr, depth_lvl + 2); self.print_expr(field_expr.expr, depth_lvl + 2);
} }
@ -643,6 +643,7 @@ impl<'a, 'tcx> ThirPrinter<'a, 'tcx> {
print_indented!(self, format!("variants: {:?}", adt_def.variants()), depth_lvl + 1); print_indented!(self, format!("variants: {:?}", adt_def.variants()), depth_lvl + 1);
print_indented!(self, format!("flags: {:?}", adt_def.flags()), depth_lvl + 1); print_indented!(self, format!("flags: {:?}", adt_def.flags()), depth_lvl + 1);
print_indented!(self, format!("repr: {:?}", adt_def.repr()), depth_lvl + 1); print_indented!(self, format!("repr: {:?}", adt_def.repr()), depth_lvl + 1);
print_indented!(self, "}", depth_lvl);
} }
fn print_fru_info(&mut self, fru_info: &FruInfo<'tcx>, depth_lvl: usize) { fn print_fru_info(&mut self, fru_info: &FruInfo<'tcx>, depth_lvl: usize) {
@ -653,6 +654,7 @@ impl<'a, 'tcx> ThirPrinter<'a, 'tcx> {
for ty in fru_info.field_types.iter() { for ty in fru_info.field_types.iter() {
print_indented!(self, format!("ty: {:?}", ty), depth_lvl + 2); print_indented!(self, format!("ty: {:?}", ty), depth_lvl + 2);
} }
print_indented!(self, "]", depth_lvl + 1);
print_indented!(self, "}", depth_lvl); print_indented!(self, "}", depth_lvl);
} }
@ -683,7 +685,7 @@ impl<'a, 'tcx> ThirPrinter<'a, 'tcx> {
fn print_pat(&mut self, pat: &Pat<'tcx>, depth_lvl: usize) { fn print_pat(&mut self, pat: &Pat<'tcx>, depth_lvl: usize) {
let &Pat { ty, span, ref kind, ref extra } = pat; let &Pat { ty, span, ref kind, ref extra } = pat;
print_indented!(self, "Pat: {", depth_lvl); print_indented!(self, "Pat {", depth_lvl);
print_indented!(self, format!("ty: {:?}", ty), depth_lvl + 1); print_indented!(self, format!("ty: {:?}", ty), depth_lvl + 1);
print_indented!(self, format!("span: {:?}", span), depth_lvl + 1); print_indented!(self, format!("span: {:?}", span), depth_lvl + 1);
self.print_pat_extra(extra.as_deref(), depth_lvl + 1); self.print_pat_extra(extra.as_deref(), depth_lvl + 1);
@ -913,6 +915,8 @@ impl<'a, 'tcx> ThirPrinter<'a, 'tcx> {
print_indented!(self, format!("options: {:?}", options), depth_lvl + 1); print_indented!(self, format!("options: {:?}", options), depth_lvl + 1);
print_indented!(self, format!("line_spans: {:?}", line_spans), depth_lvl + 1); print_indented!(self, format!("line_spans: {:?}", line_spans), depth_lvl + 1);
print_indented!(self, "}", depth_lvl);
} }
fn print_inline_operand(&mut self, operand: &InlineAsmOperand<'tcx>, depth_lvl: usize) { fn print_inline_operand(&mut self, operand: &InlineAsmOperand<'tcx>, depth_lvl: usize) {

15
compiler/rustc_resolve/src/diagnostics.rs
View file

@ -2064,9 +2064,24 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
}; };
let (b1_note, b1_help_msgs) = could_refer_to(b1, scope1, ""); let (b1_note, b1_help_msgs) = could_refer_to(b1, scope1, "");
let (b2_note, b2_help_msgs) = could_refer_to(b2, scope2, " also"); let (b2_note, b2_help_msgs) = could_refer_to(b2, scope2, " also");
let help = if kind == AmbiguityKind::GlobVsGlob
&& b1
.parent_module
.and_then(|m| m.opt_def_id())
.map(|d| !d.is_local())
.unwrap_or_default()
{
Some(&[
"consider updating this dependency to resolve this error",
"if updating the dependency does not resolve the problem report the problem to the author of the relevant crate",
] as &[_])
} else {
None
};
errors::Ambiguity { errors::Ambiguity {
ident, ident,
help,
kind: kind.descr(), kind: kind.descr(),
b1_note, b1_note,
b1_help_msgs, b1_help_msgs,

6
compiler/rustc_resolve/src/errors.rs
View file

@ -1464,6 +1464,7 @@ pub(crate) struct UnknownDiagnosticAttributeTypoSugg {
pub(crate) struct Ambiguity { pub(crate) struct Ambiguity {
pub ident: Ident, pub ident: Ident,
pub kind: &'static str, pub kind: &'static str,
pub help: Option<&'static [&'static str]>,
pub b1_note: Spanned<String>, pub b1_note: Spanned<String>,
pub b1_help_msgs: Vec<String>, pub b1_help_msgs: Vec<String>,
pub b2_note: Spanned<String>, pub b2_note: Spanned<String>,
@ -1476,6 +1477,11 @@ impl Ambiguity {
diag.span_label(self.ident.span, "ambiguous name"); diag.span_label(self.ident.span, "ambiguous name");
diag.note(format!("ambiguous because of {}", self.kind)); diag.note(format!("ambiguous because of {}", self.kind));
diag.span_note(self.b1_note.span, self.b1_note.node); diag.span_note(self.b1_note.span, self.b1_note.node);
if let Some(help) = self.help {
for help in help {
diag.help(*help);
}
}
for help_msg in self.b1_help_msgs { for help_msg in self.b1_help_msgs {
diag.help(help_msg); diag.help(help_msg);
} }

2
src/tools/compiletest/src/directives.rs
View file

@ -8,8 +8,8 @@ use tracing::*;
use crate::common::{CodegenBackend, Config, Debugger, FailMode, PassMode, RunFailMode, TestMode}; use crate::common::{CodegenBackend, Config, Debugger, FailMode, PassMode, RunFailMode, TestMode};
use crate::debuggers::{extract_cdb_version, extract_gdb_version}; use crate::debuggers::{extract_cdb_version, extract_gdb_version};
pub(crate) use crate::directives::auxiliary::AuxProps;
use crate::directives::auxiliary::parse_and_update_aux; use crate::directives::auxiliary::parse_and_update_aux;
pub(crate) use crate::directives::auxiliary::{AuxCrate, AuxProps};
use crate::directives::directive_names::{ use crate::directives::directive_names::{
KNOWN_DIRECTIVE_NAMES_SET, KNOWN_HTMLDOCCK_DIRECTIVE_NAMES, KNOWN_JSONDOCCK_DIRECTIVE_NAMES, KNOWN_DIRECTIVE_NAMES_SET, KNOWN_HTMLDOCCK_DIRECTIVE_NAMES, KNOWN_JSONDOCCK_DIRECTIVE_NAMES,
}; };

24
src/tools/compiletest/src/directives/auxiliary.rs
View file

@ -7,6 +7,16 @@ use super::directives::{AUX_BIN, AUX_BUILD, AUX_CODEGEN_BACKEND, AUX_CRATE, PROC
use crate::common::Config; use crate::common::Config;
use crate::directives::DirectiveLine; use crate::directives::DirectiveLine;
/// The value of an `aux-crate` directive.
#[derive(Clone, Debug, Default)]
pub struct AuxCrate {
/// With `aux-crate: foo=bar.rs` this will be `foo`.
/// With `aux-crate: noprelude:foo=bar.rs` this will be `noprelude:foo`.
pub name: String,
/// With `aux-crate: foo=bar.rs` this will be `bar.rs`.
pub path: String,
}
/// Properties parsed from `aux-*` test directives. /// Properties parsed from `aux-*` test directives.
#[derive(Clone, Debug, Default)] #[derive(Clone, Debug, Default)]
pub(crate) struct AuxProps { pub(crate) struct AuxProps {
@ -17,7 +27,7 @@ pub(crate) struct AuxProps {
pub(crate) bins: Vec<String>, pub(crate) bins: Vec<String>,
/// Similar to `builds`, but a list of NAME=somelib.rs of dependencies /// Similar to `builds`, but a list of NAME=somelib.rs of dependencies
/// to build and pass with the `--extern` flag. /// to build and pass with the `--extern` flag.
pub(crate) crates: Vec<(String, String)>, pub(crate) crates: Vec<AuxCrate>,
/// Same as `builds`, but for proc-macros. /// Same as `builds`, but for proc-macros.
pub(crate) proc_macros: Vec<String>, pub(crate) proc_macros: Vec<String>,
/// Similar to `builds`, but also uses the resulting dylib as a /// Similar to `builds`, but also uses the resulting dylib as a
@ -34,7 +44,7 @@ impl AuxProps {
iter::empty() iter::empty()
.chain(builds.iter().map(String::as_str)) .chain(builds.iter().map(String::as_str))
.chain(bins.iter().map(String::as_str)) .chain(bins.iter().map(String::as_str))
.chain(crates.iter().map(|(_, path)| path.as_str())) .chain(crates.iter().map(|c| c.path.as_str()))
.chain(proc_macros.iter().map(String::as_str)) .chain(proc_macros.iter().map(String::as_str))
.chain(codegen_backend.iter().map(String::as_str)) .chain(codegen_backend.iter().map(String::as_str))
} }
@ -63,10 +73,10 @@ pub(super) fn parse_and_update_aux(
} }
} }
fn parse_aux_crate(r: String) -> (String, String) { fn parse_aux_crate(r: String) -> AuxCrate {
let mut parts = r.trim().splitn(2, '='); let mut parts = r.trim().splitn(2, '=');
( AuxCrate {
parts.next().expect("missing aux-crate name (e.g. log=log.rs)").to_string(), name: parts.next().expect("missing aux-crate name (e.g. log=log.rs)").to_string(),
parts.next().expect("missing aux-crate value (e.g. log=log.rs)").to_string(), path: parts.next().expect("missing aux-crate value (e.g. log=log.rs)").to_string(),
) }
} }

8
src/tools/compiletest/src/runtest.rs
View file

@ -18,7 +18,7 @@ use crate::common::{
TestSuite, UI_EXTENSIONS, UI_FIXED, UI_RUN_STDERR, UI_RUN_STDOUT, UI_STDERR, UI_STDOUT, UI_SVG, TestSuite, UI_EXTENSIONS, UI_FIXED, UI_RUN_STDERR, UI_RUN_STDOUT, UI_STDERR, UI_STDOUT, UI_SVG,
UI_WINDOWS_SVG, expected_output_path, incremental_dir, output_base_dir, output_base_name, UI_WINDOWS_SVG, expected_output_path, incremental_dir, output_base_dir, output_base_name,
}; };
use crate::directives::TestProps; use crate::directives::{AuxCrate, TestProps};
use crate::errors::{Error, ErrorKind, load_errors}; use crate::errors::{Error, ErrorKind, load_errors};
use crate::output_capture::ConsoleOut; use crate::output_capture::ConsoleOut;
use crate::read2::{Truncated, read2_abbreviated}; use crate::read2::{Truncated, read2_abbreviated};
@ -1285,9 +1285,9 @@ impl<'test> TestCx<'test> {
} }
}; };
for (aux_name, aux_path) in &self.props.aux.crates { for AuxCrate { name, path } in &self.props.aux.crates {
let aux_type = self.build_auxiliary(&aux_path, &aux_dir, None); let aux_type = self.build_auxiliary(&path, &aux_dir, None);
add_extern(rustc, aux_name, aux_path, aux_type); add_extern(rustc, name, path, aux_type);
} }
for proc_macro in &self.props.aux.proc_macros { for proc_macro in &self.props.aux.proc_macros {

3
src/tools/opt-dist/src/main.rs
View file

@ -442,11 +442,12 @@ fn main() -> anyhow::Result<()> {
// Skip components that are not needed for fast try builds to speed them up // Skip components that are not needed for fast try builds to speed them up
if is_fast_try_build() { if is_fast_try_build() {
log::info!("Skipping building of unimportant components for a fast try build"); log::info!("Skipping building of unimportant components for a fast try build");
// Note for future onlookers: do not ignore rust-dev here. We need it for try builds when
// a PR makes a change to how LLVM is built.
for target in [ for target in [
"rust-docs", "rust-docs",
"rustc-docs", "rustc-docs",
"rustc-dev", "rustc-dev",
"rust-dev",
"rust-docs-json", "rust-docs-json",
"rust-analyzer", "rust-analyzer",
"rustc-src", "rustc-src",

4
tests/ui/imports/ambiguous-2.stderr
View file

@ -12,6 +12,8 @@ note: `id` could refer to the function defined here
| |
LL | pub use self::evp::*; LL | pub use self::evp::*;
| ^^^^^^^^^ | ^^^^^^^^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `id` could also refer to the function defined here note: `id` could also refer to the function defined here
--> $DIR/auxiliary/../ambiguous-1.rs:15:13 --> $DIR/auxiliary/../ambiguous-1.rs:15:13
| |
@ -36,6 +38,8 @@ note: `id` could refer to the function defined here
| |
LL | pub use self::evp::*; LL | pub use self::evp::*;
| ^^^^^^^^^ | ^^^^^^^^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `id` could also refer to the function defined here note: `id` could also refer to the function defined here
--> $DIR/auxiliary/../ambiguous-1.rs:15:13 --> $DIR/auxiliary/../ambiguous-1.rs:15:13
| |

4
tests/ui/imports/ambiguous-4.stderr
View file

@ -12,6 +12,8 @@ note: `id` could refer to the function defined here
| |
LL | pub use evp::*; LL | pub use evp::*;
| ^^^ | ^^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `id` could also refer to the function defined here note: `id` could also refer to the function defined here
--> $DIR/auxiliary/../ambiguous-4-extern.rs:14:9 --> $DIR/auxiliary/../ambiguous-4-extern.rs:14:9
| |
@ -36,6 +38,8 @@ note: `id` could refer to the function defined here
| |
LL | pub use evp::*; LL | pub use evp::*;
| ^^^ | ^^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `id` could also refer to the function defined here note: `id` could also refer to the function defined here
--> $DIR/auxiliary/../ambiguous-4-extern.rs:14:9 --> $DIR/auxiliary/../ambiguous-4-extern.rs:14:9
| |

8
tests/ui/imports/glob-conflict-cross-crate-1.stderr
View file

@ -12,6 +12,8 @@ note: `f` could refer to the function defined here
| |
LL | pub use m1::*; LL | pub use m1::*;
| ^^ | ^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `f` could also refer to the function defined here note: `f` could also refer to the function defined here
--> $DIR/auxiliary/glob-conflict.rs:13:9 --> $DIR/auxiliary/glob-conflict.rs:13:9
| |
@ -33,6 +35,8 @@ note: `f` could refer to the function defined here
| |
LL | pub use m1::*; LL | pub use m1::*;
| ^^ | ^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `f` could also refer to the function defined here note: `f` could also refer to the function defined here
--> $DIR/auxiliary/glob-conflict.rs:13:9 --> $DIR/auxiliary/glob-conflict.rs:13:9
| |
@ -56,6 +60,8 @@ note: `f` could refer to the function defined here
| |
LL | pub use m1::*; LL | pub use m1::*;
| ^^ | ^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `f` could also refer to the function defined here note: `f` could also refer to the function defined here
--> $DIR/auxiliary/glob-conflict.rs:13:9 --> $DIR/auxiliary/glob-conflict.rs:13:9
| |
@ -78,6 +84,8 @@ note: `f` could refer to the function defined here
| |
LL | pub use m1::*; LL | pub use m1::*;
| ^^ | ^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `f` could also refer to the function defined here note: `f` could also refer to the function defined here
--> $DIR/auxiliary/glob-conflict.rs:13:9 --> $DIR/auxiliary/glob-conflict.rs:13:9
| |

4
tests/ui/imports/glob-conflict-cross-crate-2.stderr
View file

@ -12,6 +12,8 @@ note: `C` could refer to the type alias defined here
| |
LL | pub use a::*; LL | pub use a::*;
| ^ | ^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `C` could also refer to the type alias defined here note: `C` could also refer to the type alias defined here
--> $DIR/auxiliary/glob-conflict-cross-crate-2-extern.rs:10:9 --> $DIR/auxiliary/glob-conflict-cross-crate-2-extern.rs:10:9
| |
@ -36,6 +38,8 @@ note: `C` could refer to the type alias defined here
| |
LL | pub use a::*; LL | pub use a::*;
| ^ | ^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `C` could also refer to the type alias defined here note: `C` could also refer to the type alias defined here
--> $DIR/auxiliary/glob-conflict-cross-crate-2-extern.rs:10:9 --> $DIR/auxiliary/glob-conflict-cross-crate-2-extern.rs:10:9
| |

4
tests/ui/imports/glob-conflict-cross-crate-3.stderr
View file

@ -12,6 +12,8 @@ note: `C` could refer to the type alias defined here
| |
LL | pub use a::*; LL | pub use a::*;
| ^ | ^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `C` could also refer to the type alias defined here note: `C` could also refer to the type alias defined here
--> $DIR/auxiliary/glob-conflict-cross-crate-2-extern.rs:10:9 --> $DIR/auxiliary/glob-conflict-cross-crate-2-extern.rs:10:9
| |
@ -58,6 +60,8 @@ note: `C` could refer to the type alias defined here
| |
LL | pub use a::*; LL | pub use a::*;
| ^ | ^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `C` could also refer to the type alias defined here note: `C` could also refer to the type alias defined here
--> $DIR/auxiliary/glob-conflict-cross-crate-2-extern.rs:10:9 --> $DIR/auxiliary/glob-conflict-cross-crate-2-extern.rs:10:9
| |

8
tests/ui/imports/issue-114682-2.stderr
View file

@ -12,6 +12,8 @@ note: `max` could refer to the type alias defined here
| |
LL | pub use self::e::*; LL | pub use self::e::*;
| ^^^^^^^ | ^^^^^^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `max` could also refer to the module defined here note: `max` could also refer to the module defined here
--> $DIR/auxiliary/issue-114682-2-extern.rs:16:9 --> $DIR/auxiliary/issue-114682-2-extern.rs:16:9
| |
@ -33,6 +35,8 @@ note: `max` could refer to the type alias defined here
| |
LL | pub use self::e::*; LL | pub use self::e::*;
| ^^^^^^^ | ^^^^^^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `max` could also refer to the module defined here note: `max` could also refer to the module defined here
--> $DIR/auxiliary/issue-114682-2-extern.rs:16:9 --> $DIR/auxiliary/issue-114682-2-extern.rs:16:9
| |
@ -56,6 +60,8 @@ note: `max` could refer to the type alias defined here
| |
LL | pub use self::e::*; LL | pub use self::e::*;
| ^^^^^^^ | ^^^^^^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `max` could also refer to the module defined here note: `max` could also refer to the module defined here
--> $DIR/auxiliary/issue-114682-2-extern.rs:16:9 --> $DIR/auxiliary/issue-114682-2-extern.rs:16:9
| |
@ -78,6 +84,8 @@ note: `max` could refer to the type alias defined here
| |
LL | pub use self::e::*; LL | pub use self::e::*;
| ^^^^^^^ | ^^^^^^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `max` could also refer to the module defined here note: `max` could also refer to the module defined here
--> $DIR/auxiliary/issue-114682-2-extern.rs:16:9 --> $DIR/auxiliary/issue-114682-2-extern.rs:16:9
| |

4
tests/ui/imports/issue-114682-4.stderr
View file

@ -12,6 +12,8 @@ note: `Result` could refer to the type alias defined here
| |
LL | pub use a::*; LL | pub use a::*;
| ^ | ^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `Result` could also refer to the type alias defined here note: `Result` could also refer to the type alias defined here
--> $DIR/auxiliary/issue-114682-4-extern.rs:10:9 --> $DIR/auxiliary/issue-114682-4-extern.rs:10:9
| |
@ -51,6 +53,8 @@ note: `Result` could refer to the type alias defined here
| |
LL | pub use a::*; LL | pub use a::*;
| ^ | ^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `Result` could also refer to the type alias defined here note: `Result` could also refer to the type alias defined here
--> $DIR/auxiliary/issue-114682-4-extern.rs:10:9 --> $DIR/auxiliary/issue-114682-4-extern.rs:10:9
| |

4
tests/ui/imports/issue-114682-5.stderr
View file

@ -40,6 +40,8 @@ note: `issue_114682_5_extern_1` could refer to the module defined here
| |
LL | pub use crate::types::*; LL | pub use crate::types::*;
| ^^^^^^^^^^^^ | ^^^^^^^^^^^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `issue_114682_5_extern_1` could also refer to the crate defined here note: `issue_114682_5_extern_1` could also refer to the crate defined here
--> $DIR/auxiliary/issue-114682-5-extern-2.rs:7:13 --> $DIR/auxiliary/issue-114682-5-extern-2.rs:7:13
| |
@ -67,6 +69,8 @@ note: `issue_114682_5_extern_1` could refer to the module defined here
| |
LL | pub use crate::types::*; LL | pub use crate::types::*;
| ^^^^^^^^^^^^ | ^^^^^^^^^^^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `issue_114682_5_extern_1` could also refer to the crate defined here note: `issue_114682_5_extern_1` could also refer to the crate defined here
--> $DIR/auxiliary/issue-114682-5-extern-2.rs:7:13 --> $DIR/auxiliary/issue-114682-5-extern-2.rs:7:13
| |

4
tests/ui/imports/issue-114682-6.stderr
View file

@ -12,6 +12,8 @@ note: `log` could refer to the function defined here
| |
LL | pub use self::a::*; LL | pub use self::a::*;
| ^^^^^^^ | ^^^^^^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `log` could also refer to the function defined here note: `log` could also refer to the function defined here
--> $DIR/auxiliary/issue-114682-6-extern.rs:9:9 --> $DIR/auxiliary/issue-114682-6-extern.rs:9:9
| |
@ -36,6 +38,8 @@ note: `log` could refer to the function defined here
| |
LL | pub use self::a::*; LL | pub use self::a::*;
| ^^^^^^^ | ^^^^^^^
= help: consider updating this dependency to resolve this error
= help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `log` could also refer to the function defined here note: `log` could also refer to the function defined here
--> $DIR/auxiliary/issue-114682-6-extern.rs:9:9 --> $DIR/auxiliary/issue-114682-6-extern.rs:9:9
| |

4
tests/ui/thir-print/c-variadic.stdout
View file

@ -6,7 +6,7 @@ params: [
self_kind: None self_kind: None
hir_id: Some(HirId(DefId(0:3 ~ c_variadic[a5de]::foo).1)) hir_id: Some(HirId(DefId(0:3 ~ c_variadic[a5de]::foo).1))
param: Some( param: Some(
Pat: { Pat {
ty: i32 ty: i32
span: $DIR/c-variadic.rs:7:26: 7:27 (#0) span: $DIR/c-variadic.rs:7:26: 7:27 (#0)
kind: PatKind { kind: PatKind {
@ -21,7 +21,7 @@ params: [
self_kind: None self_kind: None
hir_id: Some(HirId(DefId(0:3 ~ c_variadic[a5de]::foo).3)) hir_id: Some(HirId(DefId(0:3 ~ c_variadic[a5de]::foo).3))
param: Some( param: Some(
Pat: { Pat {
ty: std::ffi::VaList<'{erased}> ty: std::ffi::VaList<'{erased}>
span: $DIR/c-variadic.rs:7:34: 7:37 (#0) span: $DIR/c-variadic.rs:7:34: 7:37 (#0)
kind: PatKind { kind: PatKind {

18
tests/ui/thir-print/offset_of.stdout
View file

@ -27,7 +27,7 @@ body:
remainder_scope: Remainder { block: 1, first_statement_index: 0} remainder_scope: Remainder { block: 1, first_statement_index: 0}
init_scope: Node(2) init_scope: Node(2)
pattern: pattern:
Pat: { Pat {
ty: usize ty: usize
span: $DIR/offset_of.rs:37:9: 37:10 (#0) span: $DIR/offset_of.rs:37:9: 37:10 (#0)
kind: PatKind { kind: PatKind {
@ -76,7 +76,7 @@ body:
remainder_scope: Remainder { block: 1, first_statement_index: 1} remainder_scope: Remainder { block: 1, first_statement_index: 1}
init_scope: Node(12) init_scope: Node(12)
pattern: pattern:
Pat: { Pat {
ty: usize ty: usize
span: $DIR/offset_of.rs:38:9: 38:10 (#0) span: $DIR/offset_of.rs:38:9: 38:10 (#0)
kind: PatKind { kind: PatKind {
@ -125,7 +125,7 @@ body:
remainder_scope: Remainder { block: 1, first_statement_index: 2} remainder_scope: Remainder { block: 1, first_statement_index: 2}
init_scope: Node(22) init_scope: Node(22)
pattern: pattern:
Pat: { Pat {
ty: usize ty: usize
span: $DIR/offset_of.rs:39:9: 39:10 (#0) span: $DIR/offset_of.rs:39:9: 39:10 (#0)
kind: PatKind { kind: PatKind {
@ -174,7 +174,7 @@ body:
remainder_scope: Remainder { block: 1, first_statement_index: 3} remainder_scope: Remainder { block: 1, first_statement_index: 3}
init_scope: Node(32) init_scope: Node(32)
pattern: pattern:
Pat: { Pat {
ty: usize ty: usize
span: $DIR/offset_of.rs:40:9: 40:11 (#0) span: $DIR/offset_of.rs:40:9: 40:11 (#0)
kind: PatKind { kind: PatKind {
@ -223,7 +223,7 @@ body:
remainder_scope: Remainder { block: 1, first_statement_index: 4} remainder_scope: Remainder { block: 1, first_statement_index: 4}
init_scope: Node(42) init_scope: Node(42)
pattern: pattern:
Pat: { Pat {
ty: usize ty: usize
span: $DIR/offset_of.rs:41:9: 41:11 (#0) span: $DIR/offset_of.rs:41:9: 41:11 (#0)
kind: PatKind { kind: PatKind {
@ -823,7 +823,7 @@ body:
remainder_scope: Remainder { block: 1, first_statement_index: 0} remainder_scope: Remainder { block: 1, first_statement_index: 0}
init_scope: Node(2) init_scope: Node(2)
pattern: pattern:
Pat: { Pat {
ty: usize ty: usize
span: $DIR/offset_of.rs:45:9: 45:11 (#0) span: $DIR/offset_of.rs:45:9: 45:11 (#0)
kind: PatKind { kind: PatKind {
@ -872,7 +872,7 @@ body:
remainder_scope: Remainder { block: 1, first_statement_index: 1} remainder_scope: Remainder { block: 1, first_statement_index: 1}
init_scope: Node(14) init_scope: Node(14)
pattern: pattern:
Pat: { Pat {
ty: usize ty: usize
span: $DIR/offset_of.rs:46:9: 46:11 (#0) span: $DIR/offset_of.rs:46:9: 46:11 (#0)
kind: PatKind { kind: PatKind {
@ -921,7 +921,7 @@ body:
remainder_scope: Remainder { block: 1, first_statement_index: 2} remainder_scope: Remainder { block: 1, first_statement_index: 2}
init_scope: Node(26) init_scope: Node(26)
pattern: pattern:
Pat: { Pat {
ty: usize ty: usize
span: $DIR/offset_of.rs:47:9: 47:11 (#0) span: $DIR/offset_of.rs:47:9: 47:11 (#0)
kind: PatKind { kind: PatKind {
@ -970,7 +970,7 @@ body:
remainder_scope: Remainder { block: 1, first_statement_index: 3} remainder_scope: Remainder { block: 1, first_statement_index: 3}
init_scope: Node(38) init_scope: Node(38)
pattern: pattern:
Pat: { Pat {
ty: usize ty: usize
span: $DIR/offset_of.rs:48:9: 48:11 (#0) span: $DIR/offset_of.rs:48:9: 48:11 (#0)
kind: PatKind { kind: PatKind {

25
tests/ui/thir-print/thir-tree-field-expr-index.rs Normal file
View file

@ -0,0 +1,25 @@
//@ check-pass
//@ compile-flags: -Zunpretty=thir-tree
struct S {
a: u32,
b: u32,
c: u32,
d: u32,
e: u32,
}
fn update(x: u32) {
let s = S { a: x, b: x, c: x, d: x, e: x };
S { a: x , ..s };
S { b: x , ..s };
S { c: x , ..s };
S { d: x , ..s };
S { e: x , ..s };
S { b: x, d: x, ..s };
S { a: x, c: x, e: x, ..s };
}
fn main() {}

921
tests/ui/thir-print/thir-tree-field-expr-index.stdout Normal file
View file

@ -0,0 +1,921 @@
DefId(0:9 ~ thir_tree_field_expr_index[5059]::update):
params: [
Param {
ty: u32
ty_span: Some($DIR/thir-tree-field-expr-index.rs:12:14: 12:17 (#0))
self_kind: None
hir_id: Some(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).1))
param: Some(
Pat {
ty: u32
span: $DIR/thir-tree-field-expr-index.rs:12:11: 12:12 (#0)
kind: PatKind {
Binding {
name: "x"
mode: BindingMode(No, Not)
var: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
ty: u32
is_primary: true
is_shorthand: false
subpattern: None
}
}
}
)
}
]
body:
Expr {
ty: ()
temp_scope_id: 89
span: $DIR/thir-tree-field-expr-index.rs:12:19: 23:2 (#0)
kind:
Scope {
region_scope: Node(89)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).89)
value:
Expr {
ty: ()
temp_scope_id: 89
span: $DIR/thir-tree-field-expr-index.rs:12:19: 23:2 (#0)
kind:
Block {
targeted_by_break: false
span: $DIR/thir-tree-field-expr-index.rs:12:19: 23:2 (#0)
region_scope: Node(3)
safety_mode: Safe
stmts: [
Stmt {
kind: Let {
remainder_scope: Remainder { block: 3, first_statement_index: 0}
init_scope: Node(4)
pattern:
Pat {
ty: S
span: $DIR/thir-tree-field-expr-index.rs:13:7: 13:8 (#0)
kind: PatKind {
Binding {
name: "s"
mode: BindingMode(No, Not)
var: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).23))
ty: S
is_primary: true
is_shorthand: false
subpattern: None
}
}
}
,
initializer: Some(
Expr {
ty: S
temp_scope_id: 5
span: $DIR/thir-tree-field-expr-index.rs:13:11: 13:45 (#0)
kind:
Scope {
region_scope: Node(5)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).5)
value:
Expr {
ty: S
temp_scope_id: 5
span: $DIR/thir-tree-field-expr-index.rs:13:11: 13:45 (#0)
kind:
Adt {
adt_def:
AdtDef {
did: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S)
variants: [VariantDef { def_id: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S), ctor: None, name: "S", discr: Relative(0), fields: [FieldDef { did: DefId(0:4 ~ thir_tree_field_expr_index[5059]::S::a), name: "a", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:5 ~ thir_tree_field_expr_index[5059]::S::b), name: "b", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:6 ~ thir_tree_field_expr_index[5059]::S::c), name: "c", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:7 ~ thir_tree_field_expr_index[5059]::S::d), name: "d", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:8 ~ thir_tree_field_expr_index[5059]::S::e), name: "e", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }], tainted: None, flags: }]
flags: IS_STRUCT
repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 7076349371981215213 }
}
variant_index: 0
args: []
user_ty: None
field 0:
Expr {
ty: u32
temp_scope_id: 8
span: $DIR/thir-tree-field-expr-index.rs:13:18: 13:19 (#0)
kind:
Scope {
region_scope: Node(8)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).8)
value:
Expr {
ty: u32
temp_scope_id: 8
span: $DIR/thir-tree-field-expr-index.rs:13:18: 13:19 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
field 1:
Expr {
ty: u32
temp_scope_id: 11
span: $DIR/thir-tree-field-expr-index.rs:13:24: 13:25 (#0)
kind:
Scope {
region_scope: Node(11)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).11)
value:
Expr {
ty: u32
temp_scope_id: 11
span: $DIR/thir-tree-field-expr-index.rs:13:24: 13:25 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
field 2:
Expr {
ty: u32
temp_scope_id: 14
span: $DIR/thir-tree-field-expr-index.rs:13:30: 13:31 (#0)
kind:
Scope {
region_scope: Node(14)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).14)
value:
Expr {
ty: u32
temp_scope_id: 14
span: $DIR/thir-tree-field-expr-index.rs:13:30: 13:31 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
field 3:
Expr {
ty: u32
temp_scope_id: 17
span: $DIR/thir-tree-field-expr-index.rs:13:36: 13:37 (#0)
kind:
Scope {
region_scope: Node(17)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).17)
value:
Expr {
ty: u32
temp_scope_id: 17
span: $DIR/thir-tree-field-expr-index.rs:13:36: 13:37 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
field 4:
Expr {
ty: u32
temp_scope_id: 20
span: $DIR/thir-tree-field-expr-index.rs:13:42: 13:43 (#0)
kind:
Scope {
region_scope: Node(20)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).20)
value:
Expr {
ty: u32
temp_scope_id: 20
span: $DIR/thir-tree-field-expr-index.rs:13:42: 13:43 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
base: None
}
}
}
}
)
else_block: None
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).22)
span: $DIR/thir-tree-field-expr-index.rs:13:3: 13:45 (#0)
}
}
Stmt {
kind: Expr {
scope: Node(31)
expr:
Expr {
ty: S
temp_scope_id: 24
span: $DIR/thir-tree-field-expr-index.rs:15:3: 15:19 (#0)
kind:
Scope {
region_scope: Node(24)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).24)
value:
Expr {
ty: S
temp_scope_id: 24
span: $DIR/thir-tree-field-expr-index.rs:15:3: 15:19 (#0)
kind:
Adt {
adt_def:
AdtDef {
did: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S)
variants: [VariantDef { def_id: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S), ctor: None, name: "S", discr: Relative(0), fields: [FieldDef { did: DefId(0:4 ~ thir_tree_field_expr_index[5059]::S::a), name: "a", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:5 ~ thir_tree_field_expr_index[5059]::S::b), name: "b", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:6 ~ thir_tree_field_expr_index[5059]::S::c), name: "c", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:7 ~ thir_tree_field_expr_index[5059]::S::d), name: "d", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:8 ~ thir_tree_field_expr_index[5059]::S::e), name: "e", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }], tainted: None, flags: }]
flags: IS_STRUCT
repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 7076349371981215213 }
}
variant_index: 0
args: []
user_ty: None
field 0:
Expr {
ty: u32
temp_scope_id: 29
span: $DIR/thir-tree-field-expr-index.rs:15:10: 15:11 (#0)
kind:
Scope {
region_scope: Node(29)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).29)
value:
Expr {
ty: u32
temp_scope_id: 29
span: $DIR/thir-tree-field-expr-index.rs:15:10: 15:11 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
base:
FruInfo {
base:
Expr {
ty: S
temp_scope_id: 25
span: $DIR/thir-tree-field-expr-index.rs:15:16: 15:17 (#0)
kind:
Scope {
region_scope: Node(25)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).25)
value:
Expr {
ty: S
temp_scope_id: 25
span: $DIR/thir-tree-field-expr-index.rs:15:16: 15:17 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).23))
}
}
}
}
field_types: [
ty: u32
ty: u32
ty: u32
ty: u32
ty: u32
]
}
}
}
}
}
}
}
Stmt {
kind: Expr {
scope: Node(39)
expr:
Expr {
ty: S
temp_scope_id: 32
span: $DIR/thir-tree-field-expr-index.rs:16:3: 16:19 (#0)
kind:
Scope {
region_scope: Node(32)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).32)
value:
Expr {
ty: S
temp_scope_id: 32
span: $DIR/thir-tree-field-expr-index.rs:16:3: 16:19 (#0)
kind:
Adt {
adt_def:
AdtDef {
did: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S)
variants: [VariantDef { def_id: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S), ctor: None, name: "S", discr: Relative(0), fields: [FieldDef { did: DefId(0:4 ~ thir_tree_field_expr_index[5059]::S::a), name: "a", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:5 ~ thir_tree_field_expr_index[5059]::S::b), name: "b", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:6 ~ thir_tree_field_expr_index[5059]::S::c), name: "c", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:7 ~ thir_tree_field_expr_index[5059]::S::d), name: "d", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:8 ~ thir_tree_field_expr_index[5059]::S::e), name: "e", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }], tainted: None, flags: }]
flags: IS_STRUCT
repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 7076349371981215213 }
}
variant_index: 0
args: []
user_ty: None
field 1:
Expr {
ty: u32
temp_scope_id: 37
span: $DIR/thir-tree-field-expr-index.rs:16:10: 16:11 (#0)
kind:
Scope {
region_scope: Node(37)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).37)
value:
Expr {
ty: u32
temp_scope_id: 37
span: $DIR/thir-tree-field-expr-index.rs:16:10: 16:11 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
base:
FruInfo {
base:
Expr {
ty: S
temp_scope_id: 33
span: $DIR/thir-tree-field-expr-index.rs:16:16: 16:17 (#0)
kind:
Scope {
region_scope: Node(33)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).33)
value:
Expr {
ty: S
temp_scope_id: 33
span: $DIR/thir-tree-field-expr-index.rs:16:16: 16:17 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).23))
}
}
}
}
field_types: [
ty: u32
ty: u32
ty: u32
ty: u32
ty: u32
]
}
}
}
}
}
}
}
Stmt {
kind: Expr {
scope: Node(47)
expr:
Expr {
ty: S
temp_scope_id: 40
span: $DIR/thir-tree-field-expr-index.rs:17:3: 17:19 (#0)
kind:
Scope {
region_scope: Node(40)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).40)
value:
Expr {
ty: S
temp_scope_id: 40
span: $DIR/thir-tree-field-expr-index.rs:17:3: 17:19 (#0)
kind:
Adt {
adt_def:
AdtDef {
did: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S)
variants: [VariantDef { def_id: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S), ctor: None, name: "S", discr: Relative(0), fields: [FieldDef { did: DefId(0:4 ~ thir_tree_field_expr_index[5059]::S::a), name: "a", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:5 ~ thir_tree_field_expr_index[5059]::S::b), name: "b", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:6 ~ thir_tree_field_expr_index[5059]::S::c), name: "c", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:7 ~ thir_tree_field_expr_index[5059]::S::d), name: "d", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:8 ~ thir_tree_field_expr_index[5059]::S::e), name: "e", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }], tainted: None, flags: }]
flags: IS_STRUCT
repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 7076349371981215213 }
}
variant_index: 0
args: []
user_ty: None
field 2:
Expr {
ty: u32
temp_scope_id: 45
span: $DIR/thir-tree-field-expr-index.rs:17:10: 17:11 (#0)
kind:
Scope {
region_scope: Node(45)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).45)
value:
Expr {
ty: u32
temp_scope_id: 45
span: $DIR/thir-tree-field-expr-index.rs:17:10: 17:11 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
base:
FruInfo {
base:
Expr {
ty: S
temp_scope_id: 41
span: $DIR/thir-tree-field-expr-index.rs:17:16: 17:17 (#0)
kind:
Scope {
region_scope: Node(41)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).41)
value:
Expr {
ty: S
temp_scope_id: 41
span: $DIR/thir-tree-field-expr-index.rs:17:16: 17:17 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).23))
}
}
}
}
field_types: [
ty: u32
ty: u32
ty: u32
ty: u32
ty: u32
]
}
}
}
}
}
}
}
Stmt {
kind: Expr {
scope: Node(55)
expr:
Expr {
ty: S
temp_scope_id: 48
span: $DIR/thir-tree-field-expr-index.rs:18:3: 18:19 (#0)
kind:
Scope {
region_scope: Node(48)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).48)
value:
Expr {
ty: S
temp_scope_id: 48
span: $DIR/thir-tree-field-expr-index.rs:18:3: 18:19 (#0)
kind:
Adt {
adt_def:
AdtDef {
did: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S)
variants: [VariantDef { def_id: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S), ctor: None, name: "S", discr: Relative(0), fields: [FieldDef { did: DefId(0:4 ~ thir_tree_field_expr_index[5059]::S::a), name: "a", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:5 ~ thir_tree_field_expr_index[5059]::S::b), name: "b", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:6 ~ thir_tree_field_expr_index[5059]::S::c), name: "c", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:7 ~ thir_tree_field_expr_index[5059]::S::d), name: "d", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:8 ~ thir_tree_field_expr_index[5059]::S::e), name: "e", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }], tainted: None, flags: }]
flags: IS_STRUCT
repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 7076349371981215213 }
}
variant_index: 0
args: []
user_ty: None
field 3:
Expr {
ty: u32
temp_scope_id: 53
span: $DIR/thir-tree-field-expr-index.rs:18:10: 18:11 (#0)
kind:
Scope {
region_scope: Node(53)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).53)
value:
Expr {
ty: u32
temp_scope_id: 53
span: $DIR/thir-tree-field-expr-index.rs:18:10: 18:11 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
base:
FruInfo {
base:
Expr {
ty: S
temp_scope_id: 49
span: $DIR/thir-tree-field-expr-index.rs:18:16: 18:17 (#0)
kind:
Scope {
region_scope: Node(49)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).49)
value:
Expr {
ty: S
temp_scope_id: 49
span: $DIR/thir-tree-field-expr-index.rs:18:16: 18:17 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).23))
}
}
}
}
field_types: [
ty: u32
ty: u32
ty: u32
ty: u32
ty: u32
]
}
}
}
}
}
}
}
Stmt {
kind: Expr {
scope: Node(63)
expr:
Expr {
ty: S
temp_scope_id: 56
span: $DIR/thir-tree-field-expr-index.rs:19:3: 19:19 (#0)
kind:
Scope {
region_scope: Node(56)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).56)
value:
Expr {
ty: S
temp_scope_id: 56
span: $DIR/thir-tree-field-expr-index.rs:19:3: 19:19 (#0)
kind:
Adt {
adt_def:
AdtDef {
did: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S)
variants: [VariantDef { def_id: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S), ctor: None, name: "S", discr: Relative(0), fields: [FieldDef { did: DefId(0:4 ~ thir_tree_field_expr_index[5059]::S::a), name: "a", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:5 ~ thir_tree_field_expr_index[5059]::S::b), name: "b", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:6 ~ thir_tree_field_expr_index[5059]::S::c), name: "c", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:7 ~ thir_tree_field_expr_index[5059]::S::d), name: "d", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:8 ~ thir_tree_field_expr_index[5059]::S::e), name: "e", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }], tainted: None, flags: }]
flags: IS_STRUCT
repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 7076349371981215213 }
}
variant_index: 0
args: []
user_ty: None
field 4:
Expr {
ty: u32
temp_scope_id: 61
span: $DIR/thir-tree-field-expr-index.rs:19:10: 19:11 (#0)
kind:
Scope {
region_scope: Node(61)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).61)
value:
Expr {
ty: u32
temp_scope_id: 61
span: $DIR/thir-tree-field-expr-index.rs:19:10: 19:11 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
base:
FruInfo {
base:
Expr {
ty: S
temp_scope_id: 57
span: $DIR/thir-tree-field-expr-index.rs:19:16: 19:17 (#0)
kind:
Scope {
region_scope: Node(57)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).57)
value:
Expr {
ty: S
temp_scope_id: 57
span: $DIR/thir-tree-field-expr-index.rs:19:16: 19:17 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).23))
}
}
}
}
field_types: [
ty: u32
ty: u32
ty: u32
ty: u32
ty: u32
]
}
}
}
}
}
}
}
Stmt {
kind: Expr {
scope: Node(74)
expr:
Expr {
ty: S
temp_scope_id: 64
span: $DIR/thir-tree-field-expr-index.rs:21:3: 21:24 (#0)
kind:
Scope {
region_scope: Node(64)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).64)
value:
Expr {
ty: S
temp_scope_id: 64
span: $DIR/thir-tree-field-expr-index.rs:21:3: 21:24 (#0)
kind:
Adt {
adt_def:
AdtDef {
did: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S)
variants: [VariantDef { def_id: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S), ctor: None, name: "S", discr: Relative(0), fields: [FieldDef { did: DefId(0:4 ~ thir_tree_field_expr_index[5059]::S::a), name: "a", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:5 ~ thir_tree_field_expr_index[5059]::S::b), name: "b", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:6 ~ thir_tree_field_expr_index[5059]::S::c), name: "c", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:7 ~ thir_tree_field_expr_index[5059]::S::d), name: "d", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:8 ~ thir_tree_field_expr_index[5059]::S::e), name: "e", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }], tainted: None, flags: }]
flags: IS_STRUCT
repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 7076349371981215213 }
}
variant_index: 0
args: []
user_ty: None
field 1:
Expr {
ty: u32
temp_scope_id: 69
span: $DIR/thir-tree-field-expr-index.rs:21:10: 21:11 (#0)
kind:
Scope {
region_scope: Node(69)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).69)
value:
Expr {
ty: u32
temp_scope_id: 69
span: $DIR/thir-tree-field-expr-index.rs:21:10: 21:11 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
field 3:
Expr {
ty: u32
temp_scope_id: 72
span: $DIR/thir-tree-field-expr-index.rs:21:16: 21:17 (#0)
kind:
Scope {
region_scope: Node(72)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).72)
value:
Expr {
ty: u32
temp_scope_id: 72
span: $DIR/thir-tree-field-expr-index.rs:21:16: 21:17 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
base:
FruInfo {
base:
Expr {
ty: S
temp_scope_id: 65
span: $DIR/thir-tree-field-expr-index.rs:21:21: 21:22 (#0)
kind:
Scope {
region_scope: Node(65)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).65)
value:
Expr {
ty: S
temp_scope_id: 65
span: $DIR/thir-tree-field-expr-index.rs:21:21: 21:22 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).23))
}
}
}
}
field_types: [
ty: u32
ty: u32
ty: u32
ty: u32
ty: u32
]
}
}
}
}
}
}
}
Stmt {
kind: Expr {
scope: Node(88)
expr:
Expr {
ty: S
temp_scope_id: 75
span: $DIR/thir-tree-field-expr-index.rs:22:3: 22:30 (#0)
kind:
Scope {
region_scope: Node(75)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).75)
value:
Expr {
ty: S
temp_scope_id: 75
span: $DIR/thir-tree-field-expr-index.rs:22:3: 22:30 (#0)
kind:
Adt {
adt_def:
AdtDef {
did: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S)
variants: [VariantDef { def_id: DefId(0:3 ~ thir_tree_field_expr_index[5059]::S), ctor: None, name: "S", discr: Relative(0), fields: [FieldDef { did: DefId(0:4 ~ thir_tree_field_expr_index[5059]::S::a), name: "a", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:5 ~ thir_tree_field_expr_index[5059]::S::b), name: "b", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:6 ~ thir_tree_field_expr_index[5059]::S::c), name: "c", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:7 ~ thir_tree_field_expr_index[5059]::S::d), name: "d", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }, FieldDef { did: DefId(0:8 ~ thir_tree_field_expr_index[5059]::S::e), name: "e", vis: Restricted(DefId(0:0 ~ thir_tree_field_expr_index[5059])), safety: Safe, value: None }], tainted: None, flags: }]
flags: IS_STRUCT
repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 7076349371981215213 }
}
variant_index: 0
args: []
user_ty: None
field 0:
Expr {
ty: u32
temp_scope_id: 80
span: $DIR/thir-tree-field-expr-index.rs:22:10: 22:11 (#0)
kind:
Scope {
region_scope: Node(80)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).80)
value:
Expr {
ty: u32
temp_scope_id: 80
span: $DIR/thir-tree-field-expr-index.rs:22:10: 22:11 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
field 2:
Expr {
ty: u32
temp_scope_id: 83
span: $DIR/thir-tree-field-expr-index.rs:22:16: 22:17 (#0)
kind:
Scope {
region_scope: Node(83)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).83)
value:
Expr {
ty: u32
temp_scope_id: 83
span: $DIR/thir-tree-field-expr-index.rs:22:16: 22:17 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
field 4:
Expr {
ty: u32
temp_scope_id: 86
span: $DIR/thir-tree-field-expr-index.rs:22:22: 22:23 (#0)
kind:
Scope {
region_scope: Node(86)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).86)
value:
Expr {
ty: u32
temp_scope_id: 86
span: $DIR/thir-tree-field-expr-index.rs:22:22: 22:23 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).2))
}
}
}
}
base:
FruInfo {
base:
Expr {
ty: S
temp_scope_id: 76
span: $DIR/thir-tree-field-expr-index.rs:22:27: 22:28 (#0)
kind:
Scope {
region_scope: Node(76)
hir_id: HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).76)
value:
Expr {
ty: S
temp_scope_id: 76
span: $DIR/thir-tree-field-expr-index.rs:22:27: 22:28 (#0)
kind:
VarRef {
id: LocalVarId(HirId(DefId(0:9 ~ thir_tree_field_expr_index[5059]::update).23))
}
}
}
}
field_types: [
ty: u32
ty: u32
ty: u32
ty: u32
ty: u32
]
}
}
}
}
}
}
}
]
expr: []
}
}
}
}
DefId(0:10 ~ thir_tree_field_expr_index[5059]::main):
params: [
]
body:
Expr {
ty: ()
temp_scope_id: 2
span: $DIR/thir-tree-field-expr-index.rs:25:11: 25:13 (#0)
kind:
Scope {
region_scope: Node(2)
hir_id: HirId(DefId(0:10 ~ thir_tree_field_expr_index[5059]::main).2)
value:
Expr {
ty: ()
temp_scope_id: 2
span: $DIR/thir-tree-field-expr-index.rs:25:11: 25:13 (#0)
kind:
Block {
targeted_by_break: false
span: $DIR/thir-tree-field-expr-index.rs:25:11: 25:13 (#0)
region_scope: Node(1)
safety_mode: Safe
stmts: []
expr: []
}
}
}
}

6
tests/ui/thir-print/thir-tree-loop-match.stdout
View file

@ -6,7 +6,7 @@ params: [
self_kind: None self_kind: None
hir_id: Some(HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).1)) hir_id: Some(HirId(DefId(0:3 ~ thir_tree_loop_match[3c53]::boolean).1))
param: Some( param: Some(
Pat: { Pat {
ty: bool ty: bool
span: $DIR/thir-tree-loop-match.rs:7:12: 7:21 (#0) span: $DIR/thir-tree-loop-match.rs:7:12: 7:21 (#0)
kind: PatKind { kind: PatKind {
@ -117,7 +117,7 @@ body:
arms: [ arms: [
Arm { Arm {
pattern: pattern:
Pat: { Pat {
ty: bool ty: bool
span: $DIR/thir-tree-loop-match.rs:12:17: 12:21 (#0) span: $DIR/thir-tree-loop-match.rs:12:17: 12:21 (#0)
kind: PatKind { kind: PatKind {
@ -215,7 +215,7 @@ body:
} }
Arm { Arm {
pattern: pattern:
Pat: { Pat {
ty: bool ty: bool
span: $DIR/thir-tree-loop-match.rs:16:17: 16:22 (#0) span: $DIR/thir-tree-loop-match.rs:16:17: 16:22 (#0)
kind: PatKind { kind: PatKind {

16
tests/ui/thir-print/thir-tree-match.stdout
View file

@ -6,7 +6,7 @@ params: [
self_kind: None self_kind: None
hir_id: Some(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).1)) hir_id: Some(HirId(DefId(0:16 ~ thir_tree_match[fcf8]::has_match).1))
param: Some( param: Some(
Pat: { Pat {
ty: Foo ty: Foo
span: $DIR/thir-tree-match.rs:15:14: 15:17 (#0) span: $DIR/thir-tree-match.rs:15:14: 15:17 (#0)
kind: PatKind { kind: PatKind {
@ -85,7 +85,7 @@ body:
arms: [ arms: [
Arm { Arm {
pattern: pattern:
Pat: { Pat {
ty: Foo ty: Foo
span: $DIR/thir-tree-match.rs:17:9: 17:32 (#0) span: $DIR/thir-tree-match.rs:17:9: 17:32 (#0)
kind: PatKind { kind: PatKind {
@ -96,10 +96,11 @@ body:
variants: [VariantDef { def_id: DefId(0:11 ~ thir_tree_match[fcf8]::Foo::FooOne), ctor: Some((Fn, DefId(0:12 ~ thir_tree_match[fcf8]::Foo::FooOne::{constructor#0}))), name: "FooOne", discr: Relative(0), fields: [FieldDef { did: DefId(0:13 ~ thir_tree_match[fcf8]::Foo::FooOne::0), name: "0", vis: Restricted(DefId(0:0 ~ thir_tree_match[fcf8])), safety: Safe, value: None }], tainted: None, flags: }, VariantDef { def_id: DefId(0:14 ~ thir_tree_match[fcf8]::Foo::FooTwo), ctor: Some((Const, DefId(0:15 ~ thir_tree_match[fcf8]::Foo::FooTwo::{constructor#0}))), name: "FooTwo", discr: Relative(1), fields: [], tainted: None, flags: }] variants: [VariantDef { def_id: DefId(0:11 ~ thir_tree_match[fcf8]::Foo::FooOne), ctor: Some((Fn, DefId(0:12 ~ thir_tree_match[fcf8]::Foo::FooOne::{constructor#0}))), name: "FooOne", discr: Relative(0), fields: [FieldDef { did: DefId(0:13 ~ thir_tree_match[fcf8]::Foo::FooOne::0), name: "0", vis: Restricted(DefId(0:0 ~ thir_tree_match[fcf8])), safety: Safe, value: None }], tainted: None, flags: }, VariantDef { def_id: DefId(0:14 ~ thir_tree_match[fcf8]::Foo::FooTwo), ctor: Some((Const, DefId(0:15 ~ thir_tree_match[fcf8]::Foo::FooTwo::{constructor#0}))), name: "FooTwo", discr: Relative(1), fields: [], tainted: None, flags: }]
flags: IS_ENUM flags: IS_ENUM
repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 13397682652773712997 } repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 13397682652773712997 }
}
args: [] args: []
variant_index: 0 variant_index: 0
subpatterns: [ subpatterns: [
Pat: { Pat {
ty: Bar ty: Bar
span: $DIR/thir-tree-match.rs:17:21: 17:31 (#0) span: $DIR/thir-tree-match.rs:17:21: 17:31 (#0)
kind: PatKind { kind: PatKind {
@ -110,6 +111,7 @@ body:
variants: [VariantDef { def_id: DefId(0:4 ~ thir_tree_match[fcf8]::Bar::First), ctor: Some((Const, DefId(0:5 ~ thir_tree_match[fcf8]::Bar::First::{constructor#0}))), name: "First", discr: Relative(0), fields: [], tainted: None, flags: }, VariantDef { def_id: DefId(0:6 ~ thir_tree_match[fcf8]::Bar::Second), ctor: Some((Const, DefId(0:7 ~ thir_tree_match[fcf8]::Bar::Second::{constructor#0}))), name: "Second", discr: Relative(1), fields: [], tainted: None, flags: }, VariantDef { def_id: DefId(0:8 ~ thir_tree_match[fcf8]::Bar::Third), ctor: Some((Const, DefId(0:9 ~ thir_tree_match[fcf8]::Bar::Third::{constructor#0}))), name: "Third", discr: Relative(2), fields: [], tainted: None, flags: }] variants: [VariantDef { def_id: DefId(0:4 ~ thir_tree_match[fcf8]::Bar::First), ctor: Some((Const, DefId(0:5 ~ thir_tree_match[fcf8]::Bar::First::{constructor#0}))), name: "First", discr: Relative(0), fields: [], tainted: None, flags: }, VariantDef { def_id: DefId(0:6 ~ thir_tree_match[fcf8]::Bar::Second), ctor: Some((Const, DefId(0:7 ~ thir_tree_match[fcf8]::Bar::Second::{constructor#0}))), name: "Second", discr: Relative(1), fields: [], tainted: None, flags: }, VariantDef { def_id: DefId(0:8 ~ thir_tree_match[fcf8]::Bar::Third), ctor: Some((Const, DefId(0:9 ~ thir_tree_match[fcf8]::Bar::Third::{constructor#0}))), name: "Third", discr: Relative(2), fields: [], tainted: None, flags: }]
flags: IS_ENUM flags: IS_ENUM
repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 7908585036048874241 } repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 7908585036048874241 }
}
args: [] args: []
variant_index: 0 variant_index: 0
subpatterns: [] subpatterns: []
@ -147,7 +149,7 @@ body:
} }
Arm { Arm {
pattern: pattern:
Pat: { Pat {
ty: Foo ty: Foo
span: $DIR/thir-tree-match.rs:18:9: 18:23 (#0) span: $DIR/thir-tree-match.rs:18:9: 18:23 (#0)
kind: PatKind { kind: PatKind {
@ -158,10 +160,11 @@ body:
variants: [VariantDef { def_id: DefId(0:11 ~ thir_tree_match[fcf8]::Foo::FooOne), ctor: Some((Fn, DefId(0:12 ~ thir_tree_match[fcf8]::Foo::FooOne::{constructor#0}))), name: "FooOne", discr: Relative(0), fields: [FieldDef { did: DefId(0:13 ~ thir_tree_match[fcf8]::Foo::FooOne::0), name: "0", vis: Restricted(DefId(0:0 ~ thir_tree_match[fcf8])), safety: Safe, value: None }], tainted: None, flags: }, VariantDef { def_id: DefId(0:14 ~ thir_tree_match[fcf8]::Foo::FooTwo), ctor: Some((Const, DefId(0:15 ~ thir_tree_match[fcf8]::Foo::FooTwo::{constructor#0}))), name: "FooTwo", discr: Relative(1), fields: [], tainted: None, flags: }] variants: [VariantDef { def_id: DefId(0:11 ~ thir_tree_match[fcf8]::Foo::FooOne), ctor: Some((Fn, DefId(0:12 ~ thir_tree_match[fcf8]::Foo::FooOne::{constructor#0}))), name: "FooOne", discr: Relative(0), fields: [FieldDef { did: DefId(0:13 ~ thir_tree_match[fcf8]::Foo::FooOne::0), name: "0", vis: Restricted(DefId(0:0 ~ thir_tree_match[fcf8])), safety: Safe, value: None }], tainted: None, flags: }, VariantDef { def_id: DefId(0:14 ~ thir_tree_match[fcf8]::Foo::FooTwo), ctor: Some((Const, DefId(0:15 ~ thir_tree_match[fcf8]::Foo::FooTwo::{constructor#0}))), name: "FooTwo", discr: Relative(1), fields: [], tainted: None, flags: }]
flags: IS_ENUM flags: IS_ENUM
repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 13397682652773712997 } repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 13397682652773712997 }
}
args: [] args: []
variant_index: 0 variant_index: 0
subpatterns: [ subpatterns: [
Pat: { Pat {
ty: Bar ty: Bar
span: $DIR/thir-tree-match.rs:18:21: 18:22 (#0) span: $DIR/thir-tree-match.rs:18:21: 18:22 (#0)
kind: PatKind { kind: PatKind {
@ -199,7 +202,7 @@ body:
} }
Arm { Arm {
pattern: pattern:
Pat: { Pat {
ty: Foo ty: Foo
span: $DIR/thir-tree-match.rs:19:9: 19:20 (#0) span: $DIR/thir-tree-match.rs:19:9: 19:20 (#0)
kind: PatKind { kind: PatKind {
@ -210,6 +213,7 @@ body:
variants: [VariantDef { def_id: DefId(0:11 ~ thir_tree_match[fcf8]::Foo::FooOne), ctor: Some((Fn, DefId(0:12 ~ thir_tree_match[fcf8]::Foo::FooOne::{constructor#0}))), name: "FooOne", discr: Relative(0), fields: [FieldDef { did: DefId(0:13 ~ thir_tree_match[fcf8]::Foo::FooOne::0), name: "0", vis: Restricted(DefId(0:0 ~ thir_tree_match[fcf8])), safety: Safe, value: None }], tainted: None, flags: }, VariantDef { def_id: DefId(0:14 ~ thir_tree_match[fcf8]::Foo::FooTwo), ctor: Some((Const, DefId(0:15 ~ thir_tree_match[fcf8]::Foo::FooTwo::{constructor#0}))), name: "FooTwo", discr: Relative(1), fields: [], tainted: None, flags: }] variants: [VariantDef { def_id: DefId(0:11 ~ thir_tree_match[fcf8]::Foo::FooOne), ctor: Some((Fn, DefId(0:12 ~ thir_tree_match[fcf8]::Foo::FooOne::{constructor#0}))), name: "FooOne", discr: Relative(0), fields: [FieldDef { did: DefId(0:13 ~ thir_tree_match[fcf8]::Foo::FooOne::0), name: "0", vis: Restricted(DefId(0:0 ~ thir_tree_match[fcf8])), safety: Safe, value: None }], tainted: None, flags: }, VariantDef { def_id: DefId(0:14 ~ thir_tree_match[fcf8]::Foo::FooTwo), ctor: Some((Const, DefId(0:15 ~ thir_tree_match[fcf8]::Foo::FooTwo::{constructor#0}))), name: "FooTwo", discr: Relative(1), fields: [], tainted: None, flags: }]
flags: IS_ENUM flags: IS_ENUM
repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 13397682652773712997 } repr: ReprOptions { int: None, align: None, pack: None, flags: , scalable: None, field_shuffle_seed: 13397682652773712997 }
}
args: [] args: []
variant_index: 1 variant_index: 1
subpatterns: [] subpatterns: []

2
tests/ui/unpretty/box.stdout
View file

@ -27,7 +27,7 @@ body:
remainder_scope: Remainder { block: 1, first_statement_index: 0} remainder_scope: Remainder { block: 1, first_statement_index: 0}
init_scope: Node(2) init_scope: Node(2)
pattern: pattern:
Pat: { Pat {
ty: std::boxed::Box<i32, std::alloc::Global> ty: std::boxed::Box<i32, std::alloc::Global>
span: $DIR/box.rs:7:9: 7:10 (#0) span: $DIR/box.rs:7:9: 7:10 (#0)
kind: PatKind { kind: PatKind {