Merge from rustc · rust-lang/rust@1d0ad04

Merge from rustc · rust-lang/rust@1d0ad04

File tree

71 files changed

lines changed

- rustc_incremental/src/persist
- run-make/rustdoc-with-output-option
- - const-generics/generic_const_exprs

71 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -4252,6 +4252,7 @@ dependencies = [`
`4252`	`4252`	`"rustc_fluent_macro",`
`4253`	`4253`	`"rustc_hir",`
`4254`	`4254`	`"rustc_index",`
	`4255`	`+"rustc_infer",`
`4255`	`4256`	`"rustc_macros",`
`4256`	`4257`	`"rustc_middle",`
`4257`	`4258`	`"rustc_mir_build",`

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ use rustc_middle::middle::debugger_visualizer::{DebuggerVisualizerFile, Debugger`
`29`	`29`	`use rustc_middle::middle::exported_symbols;`
`30`	`30`	`use rustc_middle::middle::exported_symbols::SymbolExportKind;`
`31`	`31`	`use rustc_middle::middle::lang_items;`
`32`		`-use rustc_middle::mir::BinOp;`
`33`	`32`	`use rustc_middle::mir::mono::{CodegenUnit, CodegenUnitNameBuilder, MonoItem};`
	`33`	`+use rustc_middle::mir::BinOp;`
`34`	`34`	`use rustc_middle::query::Providers;`
`35`	`35`	`use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf, TyAndLayout};`
`36`	`36`	`use rustc_middle::ty::{self, Instance, Ty, TyCtxt};`

File renamed without changes.

File renamed without changes.

File renamed without changes.

File renamed without changes.

File renamed without changes.

File renamed without changes.

Original file line number	Diff line number	Diff line change
`@@ -139,10 +139,9 @@ where`
`139`	`139`	`ErrorHandled::TooGeneric(span)`
`140`	`140`	`}`
`141`	`141`	`err_inval!(AlreadyReported(guar)) => ErrorHandled::Reported(guar, span),`
`142`		`-err_inval!(Layout(LayoutError::ReferencesError(guar))) => ErrorHandled::Reported(`
`143`		`-ReportedErrorInfo::tainted_by_errors(guar),`
`144`		`- span,`
`145`		`-),`
	`142`	`+err_inval!(Layout(LayoutError::ReferencesError(guar))) => {`
	`143`	`+ErrorHandled::Reported(ReportedErrorInfo::tainted_by_errors(guar), span)`
	`144`	`+}`
`146`	`145`	`// Report remaining errors.`
`147`	`146`	`_ => {`
`148`	`147`	`let (our_span, frames) = get_span_and_frames();`

Original file line number	Diff line number	Diff line change
`@@ -14,10 +14,10 @@`
`14`	`14`	`#![feature(yeet_expr)]`
`15`	`15`	`#![feature(if_let_guard)]`
`16`	`16`
	`17`	`+pub mod check_consts;`
`17`	`18`	`pub mod const_eval;`
`18`	`19`	`mod errors;`
`19`	`20`	`pub mod interpret;`
`20`		`-pub mod transform;`
`21`	`21`	`pub mod util;`
`22`	`22`
`23`	`23`	`use std::sync::atomic::AtomicBool;`