Skip to content

Commit d03b986

Browse files
borsbors
committed
Auto merge of rust-lang#122117 - matthiaskrgr:rollup-3yrv3j6, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#122015 (Add better explanation for `rustc_index::IndexVec`) - rust-lang#122061 (Clarify FatalErrorHandler) - rust-lang#122062 (Explicitly assign constructed C++ classes) - rust-lang#122072 (Refer to "slice" instead of "vector" in Ord and PartialOrd trait impl of slices) - rust-lang#122088 (Remove unnecessary fixme on new thread stack size) - rust-lang#122094 (Remove outdated footnote "missing-stack-probe" in platform-support) - rust-lang#122107 (Temporarily make allow-by-default the `non_local_definitions` lint) - rust-lang#122109 (compiletest: Add a `//@ needs-threads` directive) Failed merges: - rust-lang#122104 (Rust is a proper name: rust → Rust) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 7d3702e + 5642b04 commit d03b986

File tree

93 files changed

+279
-200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+279
-200
lines changed

‎compiler/rustc_index/src/vec.rs

+18-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,24 @@ use std::vec;
1212
use crate::{Idx, IndexSlice};
1313

1414
/// An owned contiguous collection of `T`s, indexed by `I` rather than by `usize`.
15-
/// Its purpose is to avoid mixing indexes.
15+
///
16+
/// ## Why use this instead of a `Vec`?
17+
///
18+
/// An `IndexVec` allows element access only via a specific associated index type, meaning that
19+
/// trying to use the wrong index type (possibly accessing an invalid element) will fail at
20+
/// compile time.
21+
///
22+
/// It also documents what the index is indexing: in a `HashMap<usize, Something>` it's not
23+
/// immediately clear what the `usize` means, while a `HashMap<FieldIdx, Something>` makes it obvious.
24+
///
25+
/// ```compile_fail
26+
/// use rustc_index::{Idx, IndexVec};
27+
///
28+
/// fn f<I1: Idx, I2: Idx>(vec1: IndexVec<I1, u8>, idx1: I1, idx2: I2) {
29+
/// &vec1[idx1]; // Ok
30+
/// &vec1[idx2]; // Compile error!
31+
/// }
32+
/// ```
1633
///
1734
/// While it's possible to use `u32` or `usize` directly for `I`,
1835
/// you almost certainly want to use a [`newtype_index!`]-generated type instead.

‎compiler/rustc_lint/src/non_local_def.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ declare_lint! {
1414
/// ### Example
1515
///
1616
/// ```rust
17+
/// #![warn(non_local_definitions)]
1718
/// trait MyTrait {}
1819
/// struct MyStruct;
1920
///
@@ -36,7 +37,7 @@ declare_lint! {
3637
/// All nested bodies (functions, enum discriminant, array length, consts) (expect for
3738
/// `const _: Ty = { ... }` in top-level module, which is still undecided) are checked.
3839
pub NON_LOCAL_DEFINITIONS,
39-
Warn,
40+
Allow,
4041
"checks for non-local definitions",
4142
report_in_external_macro
4243
}

‎compiler/rustc_llvm/llvm-wrapper/CoverageMappingWrapper.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ extern "C" void LLVMRustCoverageWriteFilenamesSectionToBuffer(
120120
}
121121
auto FilenamesWriter =
122122
coverage::CoverageFilenamesSectionWriter(ArrayRef<std::string>(FilenameRefs));
123-
RawRustStringOstream OS(BufferOut);
123+
auto OS = RawRustStringOstream(BufferOut);
124124
FilenamesWriter.write(OS);
125125
}
126126

@@ -160,31 +160,31 @@ extern "C" void LLVMRustCoverageWriteMappingToBuffer(
160160
ArrayRef<unsigned>(VirtualFileMappingIDs, NumVirtualFileMappingIDs),
161161
Expressions,
162162
MappingRegions);
163-
RawRustStringOstream OS(BufferOut);
163+
auto OS = RawRustStringOstream(BufferOut);
164164
CoverageMappingWriter.write(OS);
165165
}
166166

167167
extern "C" LLVMValueRef LLVMRustCoverageCreatePGOFuncNameVar(
168168
LLVMValueRef F,
169169
const char *FuncName,
170170
size_t FuncNameLen) {
171-
StringRef FuncNameRef(FuncName, FuncNameLen);
171+
auto FuncNameRef = StringRef(FuncName, FuncNameLen);
172172
return wrap(createPGOFuncNameVar(*cast<Function>(unwrap(F)), FuncNameRef));
173173
}
174174

175175
extern "C" uint64_t LLVMRustCoverageHashByteArray(
176176
const char *Bytes,
177177
size_t NumBytes) {
178-
StringRef StrRef(Bytes, NumBytes);
178+
auto StrRef = StringRef(Bytes, NumBytes);
179179
return IndexedInstrProf::ComputeHash(StrRef);
180180
}
181181

182182
static void WriteSectionNameToString(LLVMModuleRef M,
183183
InstrProfSectKind SK,
184184
RustStringRef Str) {
185-
Triple TargetTriple(unwrap(M)->getTargetTriple());
185+
auto TargetTriple = Triple(unwrap(M)->getTargetTriple());
186186
auto name = getInstrProfSectionName(SK, TargetTriple.getObjectFormat());
187-
RawRustStringOstream OS(Str);
187+
auto OS = RawRustStringOstream(Str);
188188
OS << name;
189189
}
190190

@@ -200,7 +200,7 @@ extern "C" void LLVMRustCoverageWriteFuncSectionNameToString(LLVMModuleRef M,
200200

201201
extern "C" void LLVMRustCoverageWriteMappingVarNameToString(RustStringRef Str) {
202202
auto name = getCoverageMappingVarName();
203-
RawRustStringOstream OS(Str);
203+
auto OS = RawRustStringOstream(Str);
204204
OS << name;
205205
}
206206

‎compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp

+21-21
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ extern "C" void LLVMRustTimeTraceProfilerFinishThread() {
7777
}
7878

7979
extern "C" void LLVMRustTimeTraceProfilerFinish(const char* FileName) {
80-
StringRef FN(FileName);
80+
auto FN = StringRef(FileName);
8181
std::error_code EC;
82-
raw_fd_ostream OS(FN, EC, sys::fs::CD_CreateAlways);
82+
auto OS = raw_fd_ostream(FN, EC, sys::fs::CD_CreateAlways);
8383

8484
timeTraceProfilerWrite(OS);
8585
timeTraceProfilerCleanup();
@@ -424,7 +424,7 @@ extern "C" LLVMTargetMachineRef LLVMRustCreateTargetMachine(
424424
auto CM = fromRust(RustCM);
425425

426426
std::string Error;
427-
Triple Trip(Triple::normalize(TripleStr));
427+
auto Trip = Triple(Triple::normalize(TripleStr));
428428
const llvm::Target *TheTarget =
429429
TargetRegistry::lookupTarget(Trip.getTriple(), Error);
430430
if (TheTarget == nullptr) {
@@ -537,8 +537,8 @@ extern "C" void LLVMRustDisposeTargetMachine(LLVMTargetMachineRef TM) {
537537
// TargetLibraryInfo pass, so we use this method to do so.
538538
extern "C" void LLVMRustAddLibraryInfo(LLVMPassManagerRef PMR, LLVMModuleRef M,
539539
bool DisableSimplifyLibCalls) {
540-
Triple TargetTriple(unwrap(M)->getTargetTriple());
541-
TargetLibraryInfoImpl TLII(TargetTriple);
540+
auto TargetTriple = Triple(unwrap(M)->getTargetTriple());
541+
auto TLII = TargetLibraryInfoImpl(TargetTriple);
542542
if (DisableSimplifyLibCalls)
543543
TLII.disableAllFunctions();
544544
unwrap(PMR)->add(new TargetLibraryInfoWrapperPass(TLII));
@@ -589,25 +589,25 @@ LLVMRustWriteOutputFile(LLVMTargetMachineRef Target, LLVMPassManagerRef PMR,
589589

590590
std::string ErrorInfo;
591591
std::error_code EC;
592-
raw_fd_ostream OS(Path, EC, sys::fs::OF_None);
592+
auto OS = raw_fd_ostream(Path, EC, sys::fs::OF_None);
593593
if (EC)
594594
ErrorInfo = EC.message();
595595
if (ErrorInfo != "") {
596596
LLVMRustSetLastError(ErrorInfo.c_str());
597597
return LLVMRustResult::Failure;
598598
}
599599

600-
buffer_ostream BOS(OS);
600+
auto BOS = buffer_ostream(OS);
601601
if (DwoPath) {
602-
raw_fd_ostream DOS(DwoPath, EC, sys::fs::OF_None);
602+
auto DOS = raw_fd_ostream(DwoPath, EC, sys::fs::OF_None);
603603
EC.clear();
604604
if (EC)
605605
ErrorInfo = EC.message();
606606
if (ErrorInfo != "") {
607607
LLVMRustSetLastError(ErrorInfo.c_str());
608608
return LLVMRustResult::Failure;
609609
}
610-
buffer_ostream DBOS(DOS);
610+
auto DBOS = buffer_ostream(DOS);
611611
unwrap(Target)->addPassesToEmitFile(*PM, BOS, &DBOS, FileType, false);
612612
PM->run(*unwrap(M));
613613
} else {
@@ -796,7 +796,7 @@ LLVMRustOptimize(
796796
DebugInfoForProfiling);
797797
}
798798

799-
PassBuilder PB(TM, PTO, PGOOpt, &PIC);
799+
auto PB = PassBuilder(TM, PTO, PGOOpt, &PIC);
800800
LoopAnalysisManager LAM;
801801
FunctionAnalysisManager FAM;
802802
CGSCCAnalysisManager CGAM;
@@ -1112,16 +1112,16 @@ extern "C" LLVMRustResult
11121112
LLVMRustPrintModule(LLVMModuleRef M, const char *Path, DemangleFn Demangle) {
11131113
std::string ErrorInfo;
11141114
std::error_code EC;
1115-
raw_fd_ostream OS(Path, EC, sys::fs::OF_None);
1115+
auto OS = raw_fd_ostream(Path, EC, sys::fs::OF_None);
11161116
if (EC)
11171117
ErrorInfo = EC.message();
11181118
if (ErrorInfo != "") {
11191119
LLVMRustSetLastError(ErrorInfo.c_str());
11201120
return LLVMRustResult::Failure;
11211121
}
11221122

1123-
RustAssemblyAnnotationWriter AAW(Demangle);
1124-
formatted_raw_ostream FOS(OS);
1123+
auto AAW = RustAssemblyAnnotationWriter(Demangle);
1124+
auto FOS = formatted_raw_ostream(OS);
11251125
unwrap(M)->print(FOS, &AAW);
11261126

11271127
return LLVMRustResult::Success;
@@ -1281,8 +1281,8 @@ LLVMRustCreateThinLTOData(LLVMRustThinLTOModule *modules,
12811281
// Load each module's summary and merge it into one combined index
12821282
for (int i = 0; i < num_modules; i++) {
12831283
auto module = &modules[i];
1284-
StringRef buffer(module->data, module->len);
1285-
MemoryBufferRef mem_buffer(buffer, module->identifier);
1284+
auto buffer = StringRef(module->data, module->len);
1285+
auto mem_buffer = MemoryBufferRef(buffer, module->identifier);
12861286

12871287
Ret->ModuleMap[module->identifier] = mem_buffer;
12881288

@@ -1485,7 +1485,7 @@ LLVMRustPrepareThinLTOImport(const LLVMRustThinLTOData *Data, LLVMModuleRef M,
14851485
return MOrErr;
14861486
};
14871487
bool ClearDSOLocal = clearDSOLocalOnDeclarations(Mod, Target);
1488-
FunctionImporter Importer(Data->Index, Loader, ClearDSOLocal);
1488+
auto Importer = FunctionImporter(Data->Index, Loader, ClearDSOLocal);
14891489
Expected<bool> Result = Importer.importFunctions(Mod, ImportList);
14901490
if (!Result) {
14911491
LLVMRustSetLastError(toString(Result.takeError()).c_str());
@@ -1510,7 +1510,7 @@ extern "C" LLVMRustThinLTOBuffer*
15101510
LLVMRustThinLTOBufferCreate(LLVMModuleRef M, bool is_thin) {
15111511
auto Ret = std::make_unique<LLVMRustThinLTOBuffer>();
15121512
{
1513-
raw_string_ostream OS(Ret->data);
1513+
auto OS = raw_string_ostream(Ret->data);
15141514
{
15151515
if (is_thin) {
15161516
PassBuilder PB;
@@ -1557,8 +1557,8 @@ LLVMRustParseBitcodeForLTO(LLVMContextRef Context,
15571557
const char *data,
15581558
size_t len,
15591559
const char *identifier) {
1560-
StringRef Data(data, len);
1561-
MemoryBufferRef Buffer(Data, identifier);
1560+
auto Data = StringRef(data, len);
1561+
auto Buffer = MemoryBufferRef(Data, identifier);
15621562
unwrap(Context)->enableDebugTypeODRUniquing();
15631563
Expected<std::unique_ptr<Module>> SrcOrError =
15641564
parseBitcodeFile(Buffer, *unwrap(Context));
@@ -1576,8 +1576,8 @@ extern "C" const char *LLVMRustGetSliceFromObjectDataByName(const char *data,
15761576
const char *name,
15771577
size_t *out_len) {
15781578
*out_len = 0;
1579-
StringRef Data(data, len);
1580-
MemoryBufferRef Buffer(Data, ""); // The id is unused.
1579+
auto Data = StringRef(data, len);
1580+
auto Buffer = MemoryBufferRef(Data, ""); // The id is unused.
15811581
file_magic Type = identify_magic(Buffer.getBuffer());
15821582
Expected<std::unique_ptr<object::ObjectFile>> ObjFileOrError =
15831583
object::ObjectFile::createObjectFile(Buffer, Type);

0 commit comments

Comments
 (0)