From c981d67b509f1ba16c97683ad6dc430429899e49 Mon Sep 17 00:00:00 2001
From: Dylan MacKenzie <ecstaticmorse@gmail.com>
Date: Sat, 8 Feb 2020 16:30:45 -0800
Subject: [PATCH] [!] Use `rustc_inherit_overflow_checks` in
 `next_power_of_two`

I believe the previous code was calling `ops::Add::add` instead of the
`+` operator to get this behavior.
---
 src/libcore/num/mod.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index ed37b48b3e85..f86376cac888 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -8,7 +8,6 @@ use crate::convert::Infallible;
 use crate::fmt;
 use crate::intrinsics;
 use crate::mem;
-use crate::ops;
 use crate::str::FromStr;
 
 macro_rules! impl_nonzero_fmt {
@@ -4042,9 +4041,9 @@ assert_eq!(3", stringify!($SelfT), ".next_power_of_two(), 4);", $EndFeature, "
 ```"),
             #[stable(feature = "rust1", since = "1.0.0")]
             #[inline]
+            #[rustc_inherit_overflow_checks]
             pub fn next_power_of_two(self) -> Self {
-                // Call the trait to get overflow checks
-                ops::Add::add(self.one_less_than_next_power_of_two(), 1)
+                self.one_less_than_next_power_of_two() + 1
             }
         }