upstream_utils/llvm_patches/0021-Prefer-wpi-s-fs.h.patch

From 7943842aea1a05a1dd2c2c753378af569c24293b Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Sun, 8 May 2022 16:49:36 -0400
Subject: [PATCH 21/28] Prefer wpi's fs.h

---
 llvm/include/llvm/Support/raw_ostream.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/llvm/include/llvm/Support/raw_ostream.h b/llvm/include/llvm/Support/raw_ostream.h
index bf5630ab5..256bcec25 100644
--- a/llvm/include/llvm/Support/raw_ostream.h
+++ b/llvm/include/llvm/Support/raw_ostream.h
@@ -27,18 +27,15 @@
 #include <type_traits>
 #include <vector>
 
-namespace llvm {
-
-template <class T> class LLVM_NODISCARD Expected;
 
-namespace sys {
 namespace fs {
 enum FileAccess : unsigned;
 enum OpenFlags : unsigned;
 enum CreationDisposition : unsigned;
 class FileLocker;
 } // end namespace fs
-} // end namespace sys
+
+namespace llvm {
 
 /// This class implements an extremely fast bulk output stream that can *only*
 /// output to a stream.  It does not support seeking, reopening, rewinding, line