about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Goulet <michael@errs.io>2025-03-23 14:59:32 -0400
committerGitHub <noreply@github.com>2025-03-23 14:59:32 -0400
commitbb49f0d8b66575443c942e72908f1846ad5b943d (patch)
tree46804651fda1f78a0770444449cde887231028c8
parente31d3e3bde5c61f2c6e0ab3c504804e6d19da443 (diff)
parentbcac931956f7a5c271914f8e1973b8195eedb498 (diff)
downloadrust-bb49f0d8b66575443c942e72908f1846ad5b943d.tar.gz
rust-bb49f0d8b66575443c942e72908f1846ad5b943d.zip
Rollup merge of #138631 - thaliaarchi:sgx-read-buf-test, r=workingjubilee
Update test for SGX now implementing `read_buf`

In #108326, `read_buf` was implemented for a variety of types, but SGX was saved for later. Update a test from then, now that #137355 implemented it for SGX types.

cc ````@jethrogb````
-rw-r--r--library/std/src/net/tcp/tests.rs8
1 files changed, 2 insertions, 6 deletions
diff --git a/library/std/src/net/tcp/tests.rs b/library/std/src/net/tcp/tests.rs
index a7b5cdf4ec0..03003037b29 100644
--- a/library/std/src/net/tcp/tests.rs
+++ b/library/std/src/net/tcp/tests.rs
@@ -315,12 +315,8 @@ fn read_buf() {
         let mut buf = BorrowedBuf::from(buf.as_mut_slice());
         t!(s.read_buf(buf.unfilled()));
         assert_eq!(buf.filled(), &[1, 2, 3, 4]);
-
-        // FIXME: sgx uses default_read_buf that initializes the buffer.
-        if cfg!(not(target_env = "sgx")) {
-            // TcpStream::read_buf should omit buffer initialization.
-            assert_eq!(buf.init_len(), 4);
-        }
+        // TcpStream::read_buf should omit buffer initialization.
+        assert_eq!(buf.init_len(), 4);
 
         t.join().ok().expect("thread panicked");
     })