bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Reduce merge conflicts from rustfmt's wrapping

Browse source
This commit is contained in:
Kornel 2024-06-28 18:15:12 +01:00
parent 99f77a2eda
commit 4061fd9e4e
1 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
compiler/rustc_interface/src/tests.rs
View file

@ -2,14 +2,22 @@
use crate::interface::{initialize_checked_jobserver, parse_cfg}; use crate::interface::{initialize_checked_jobserver, parse_cfg};
use rustc_data_structures::profiling::TimePassesFormat; use rustc_data_structures::profiling::TimePassesFormat;
use rustc_errors::{emitter::HumanReadableErrorType, registry, ColorConfig}; use rustc_errors::{emitter::HumanReadableErrorType, registry, ColorConfig};
use rustc_session::config::{build_configuration, build_session_options, rustc_optgroups};
use rustc_session::config::{ use rustc_session::config::{
build_configuration, build_session_options, rustc_optgroups, BranchProtection, CFGuard, Cfg, BranchProtection, CFGuard, Cfg, CollapseMacroDebuginfo, CoverageLevel, CoverageOptions,
CollapseMacroDebuginfo, CoverageLevel, CoverageOptions, DebugInfo, DumpMonoStatsFormat, DebugInfo, DumpMonoStatsFormat, ErrorOutputType,
ErrorOutputType, ExternEntry, ExternLocation, Externs, FunctionReturn, InliningThreshold, };
Input, InstrumentCoverage, InstrumentXRay, LinkSelfContained, LinkerPluginLto, LocationDetail, use rustc_session::config::{
LtoCli, NextSolverConfig, OomStrategy, Options, OutFileName, OutputType, OutputTypes, PAuthKey, ExternEntry, ExternLocation, Externs, FunctionReturn, InliningThreshold, Input,
PacRet, Passes, PatchableFunctionEntry, Polonius, ProcMacroExecutionStrategy, Strip, InstrumentCoverage, InstrumentXRay, LinkSelfContained, LinkerPluginLto,
SwitchWithOptPath, SymbolManglingVersion, WasiExecModel, };
use rustc_session::config::{
LocationDetail, LtoCli, NextSolverConfig, OomStrategy, Options, OutFileName, OutputType,
OutputTypes, PAuthKey, PacRet, Passes, PatchableFunctionEntry,
};
use rustc_session::config::{
Polonius, ProcMacroExecutionStrategy, Strip, SwitchWithOptPath, SymbolManglingVersion,
WasiExecModel,
}; };
use rustc_session::lint::Level; use rustc_session::lint::Level;
use rustc_session::search_paths::SearchPath; use rustc_session::search_paths::SearchPath;