bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #84724 - MaskRay:sys-fs, r=petrochenkov

Browse source 
Replace llvm::sys::fs::F_None with llvm::sys::fs::OF_None

The former is deprecated.
OF_None has been available in LLVM since 2018-06.

-----

OF_None (https://reviews.llvm.org/rG1f67a3cba9b09636c56e2109d8a35ae96dc15782) exists in LLVM 9.
https://reviews.llvm.org/D101506 may drop `F_None` support.
This commit is contained in:
Yuki Okushi 2021-05-01 18:32:34 +09:00 • committed by GitHub
commit 4d6d26ec6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_llvm/llvm-wrapper/PassWrapper.cpp
View file

@ -609,7 +609,7 @@ LLVMRustWriteOutputFile(LLVMTargetMachineRef Target, LLVMPassManagerRef PMR,
std::string ErrorInfo; std::string ErrorInfo;
std::error_code EC; std::error_code EC;
raw_fd_ostream OS(Path, EC, sys::fs::F_None); raw_fd_ostream OS(Path, EC, sys::fs::OF_None);
if (EC) if (EC)
ErrorInfo = EC.message(); ErrorInfo = EC.message();
if (ErrorInfo != "") { if (ErrorInfo != "") {
@ -619,7 +619,7 @@ LLVMRustWriteOutputFile(LLVMTargetMachineRef Target, LLVMPassManagerRef PMR,
buffer_ostream BOS(OS); buffer_ostream BOS(OS);
if (DwoPath) { if (DwoPath) {
raw_fd_ostream DOS(DwoPath, EC, sys::fs::F_None); raw_fd_ostream DOS(DwoPath, EC, sys::fs::OF_None);
EC.clear(); EC.clear();
if (EC) if (EC)
ErrorInfo = EC.message(); ErrorInfo = EC.message();
@ -1146,7 +1146,7 @@ extern "C" LLVMRustResult
LLVMRustPrintModule(LLVMModuleRef M, const char *Path, DemangleFn Demangle) { LLVMRustPrintModule(LLVMModuleRef M, const char *Path, DemangleFn Demangle) {
std::string ErrorInfo; std::string ErrorInfo;
std::error_code EC; std::error_code EC;
raw_fd_ostream OS(Path, EC, sys::fs::F_None); raw_fd_ostream OS(Path, EC, sys::fs::OF_None);
if (EC) if (EC)
ErrorInfo = EC.message(); ErrorInfo = EC.message();
if (ErrorInfo != "") { if (ErrorInfo != "") {