Skip to content

Commit 04a3969

Browse files
authored
Rollup merge of #127090 - kornelski:wrap-conflicts, r=fee1-dead
Reduce merge conflicts from rustfmt's wrapping Imports in this file are changed by many different features. Rustfmt insists on reformatting and rewrapping the imports every time they change, which causes chronic merge conflicts. I've split the big import into multiple smaller ones, so that different features will conflict less often.
2 parents c471e07 + 4061fd9 commit 04a3969

File tree

1 file changed

+15
-7
lines changed

1 file changed

+15
-7
lines changed

compiler/rustc_interface/src/tests.rs

+15-7
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,22 @@
22
use crate::interface::{initialize_checked_jobserver, parse_cfg};
33
use rustc_data_structures::profiling::TimePassesFormat;
44
use rustc_errors::{emitter::HumanReadableErrorType, registry, ColorConfig};
5+
use rustc_session::config::{build_configuration, build_session_options, rustc_optgroups};
56
use rustc_session::config::{
6-
build_configuration, build_session_options, rustc_optgroups, BranchProtection, CFGuard, Cfg,
7-
CollapseMacroDebuginfo, CoverageLevel, CoverageOptions, DebugInfo, DumpMonoStatsFormat,
8-
ErrorOutputType, ExternEntry, ExternLocation, Externs, FunctionReturn, InliningThreshold,
9-
Input, InstrumentCoverage, InstrumentXRay, LinkSelfContained, LinkerPluginLto, LocationDetail,
10-
LtoCli, NextSolverConfig, OomStrategy, Options, OutFileName, OutputType, OutputTypes, PAuthKey,
11-
PacRet, Passes, PatchableFunctionEntry, Polonius, ProcMacroExecutionStrategy, Strip,
12-
SwitchWithOptPath, SymbolManglingVersion, WasiExecModel,
7+
BranchProtection, CFGuard, Cfg, CollapseMacroDebuginfo, CoverageLevel, CoverageOptions,
8+
DebugInfo, DumpMonoStatsFormat, ErrorOutputType,
9+
};
10+
use rustc_session::config::{
11+
ExternEntry, ExternLocation, Externs, FunctionReturn, InliningThreshold, Input,
12+
InstrumentCoverage, InstrumentXRay, LinkSelfContained, LinkerPluginLto,
13+
};
14+
use rustc_session::config::{
15+
LocationDetail, LtoCli, NextSolverConfig, OomStrategy, Options, OutFileName, OutputType,
16+
OutputTypes, PAuthKey, PacRet, Passes, PatchableFunctionEntry,
17+
};
18+
use rustc_session::config::{
19+
Polonius, ProcMacroExecutionStrategy, Strip, SwitchWithOptPath, SymbolManglingVersion,
20+
WasiExecModel,
1321
};
1422
use rustc_session::lint::Level;
1523
use rustc_session::search_paths::SearchPath;

0 commit comments

Comments
 (0)