From 784b50cece5df7cf6539cb7912a17ae270c9268d Mon Sep 17 00:00:00 2001 From: hi-rustin Date: Thu, 11 Jan 2024 09:41:23 +0800 Subject: [PATCH 1/2] chore: remove unnecessary blank line Signed-off-by: hi-rustin --- library/alloc/src/raw_vec.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/library/alloc/src/raw_vec.rs b/library/alloc/src/raw_vec.rs index 74fa30456eb95..45e8224016466 100644 --- a/library/alloc/src/raw_vec.rs +++ b/library/alloc/src/raw_vec.rs @@ -552,7 +552,6 @@ fn handle_reserve(result: Result<(), TryReserveError>) { // `> isize::MAX` bytes will surely fail. On 32-bit and 16-bit we need to add // an extra guard for this in case we're running on a platform which can use // all 4GB in user-space, e.g., PAE or x32. - #[inline] fn alloc_guard(alloc_size: usize) -> Result<(), TryReserveError> { if usize::BITS < 64 && alloc_size > isize::MAX as usize { From 90cc8ba4bc59e1034e275b67553d1b9cc9249798 Mon Sep 17 00:00:00 2001 From: hi-rustin Date: Thu, 11 Jan 2024 21:39:44 +0800 Subject: [PATCH 2/2] fix: update broken stderr Signed-off-by: hi-rustin --- tests/ui/hygiene/panic-location.run.stderr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ui/hygiene/panic-location.run.stderr b/tests/ui/hygiene/panic-location.run.stderr index 5c552411da7f3..5824ef31211be 100644 --- a/tests/ui/hygiene/panic-location.run.stderr +++ b/tests/ui/hygiene/panic-location.run.stderr @@ -1,3 +1,3 @@ -thread 'main' panicked at library/alloc/src/raw_vec.rs:571:5: +thread 'main' panicked at library/alloc/src/raw_vec.rs:570:5: capacity overflow note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace