diff options
| author | bors <bors@rust-lang.org> | 2024-04-08 14:15:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-08 14:15:48 +0000 |
| commit | ab3dba92db355b8d97db915a2dca161a117e959c (patch) | |
| tree | 788440fa9a858bba6b4f3743642b7c726e8e7299 /compiler/rustc_llvm/llvm-wrapper | |
| parent | 75fd074338801fba74a8cf7f8c48c5c5be362d08 (diff) | |
| parent | f8252712a5339d18405a19037b30be23aefeb476 (diff) | |
| download | rust-ab3dba92db355b8d97db915a2dca161a117e959c.tar.gz rust-ab3dba92db355b8d97db915a2dca161a117e959c.zip | |
Auto merge of #123628 - matthiaskrgr:rollup-6otgb94, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #115984 (extending filesystem support for Hermit) - #120144 (privacy: Stabilize lint `unnameable_types`) - #122807 (Add consistency with phrases "meantime" and "mean time") - #123089 (Add invariant to VecDeque::pop_* that len < cap if pop successful) - #123595 (Documentation fix) - #123625 (Stop exporting `TypeckRootCtxt` and `FnCtxt`.) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp index 40723ff9f5e..64e6c18092f 100644 --- a/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/ArchiveWrapper.cpp @@ -147,7 +147,7 @@ LLVMRustArchiveChildName(LLVMRustArchiveChildConstRef Child, size_t *Size) { Expected<StringRef> NameOrErr = Child->getName(); if (!NameOrErr) { // rustc_codegen_llvm currently doesn't use this error string, but it might be - // useful in the future, and in the mean time this tells LLVM that the + // useful in the future, and in the meantime this tells LLVM that the // error was not ignored and that it shouldn't abort the process. LLVMRustSetLastError(toString(NameOrErr.takeError()).c_str()); return nullptr; |
