bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #107223 - ChayimFriedman2:patch-5, r=WaffleLapkin

Browse source 
`sub_ptr()` is equivalent to `usize::try_from().unwrap_unchecked()`, not `usize::from().unwrap_unchecked()`

`usize::from()` gives a `usize`, not `Result<usize>`, and `usize: From<isize>` is not implemented.
This commit is contained in:
Dylan DPC 2023-01-25 17:01:43 +05:30 • committed by GitHub
commit 24066910ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
library/core/src/ptr/const_ptr.rs
View file

@ -731,7 +731,7 @@ impl<T: ?Sized> *const T {
/// This computes the same value that [`offset_from`](#method.offset_from) /// This computes the same value that [`offset_from`](#method.offset_from)
/// would compute, but with the added precondition that the offset is /// would compute, but with the added precondition that the offset is
/// guaranteed to be non-negative. This method is equivalent to /// guaranteed to be non-negative. This method is equivalent to
/// `usize::from(self.offset_from(origin)).unwrap_unchecked()`, /// `usize::try_from(self.offset_from(origin)).unwrap_unchecked()`,
/// but it provides slightly more information to the optimizer, which can /// but it provides slightly more information to the optimizer, which can
/// sometimes allow it to optimize slightly better with some backends. /// sometimes allow it to optimize slightly better with some backends.
/// ///

2
library/core/src/ptr/mut_ptr.rs
View file

@ -904,7 +904,7 @@ impl<T: ?Sized> *mut T {
/// This computes the same value that [`offset_from`](#method.offset_from) /// This computes the same value that [`offset_from`](#method.offset_from)
/// would compute, but with the added precondition that the offset is /// would compute, but with the added precondition that the offset is
/// guaranteed to be non-negative. This method is equivalent to /// guaranteed to be non-negative. This method is equivalent to
/// `usize::from(self.offset_from(origin)).unwrap_unchecked()`, /// `usize::try_from(self.offset_from(origin)).unwrap_unchecked()`,
/// but it provides slightly more information to the optimizer, which can /// but it provides slightly more information to the optimizer, which can
/// sometimes allow it to optimize slightly better with some backends. /// sometimes allow it to optimize slightly better with some backends.
/// ///