diff options
| author | bors <bors@rust-lang.org> | 2020-01-05 17:31:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-05 17:31:32 +0000 |
| commit | bc1571cc3cfef07251f7df52b95525aa16797ca2 (patch) | |
| tree | 5f3fb5773cad1973ec174a5e1436076bd5fa87ee /src/libcore | |
| parent | b69f6e65c081f9a628ef5db83ba77e3861e60e60 (diff) | |
| parent | b9160fb56ced49c6087acb782c3260fab3936be9 (diff) | |
| download | rust-bc1571cc3cfef07251f7df52b95525aa16797ca2.tar.gz rust-bc1571cc3cfef07251f7df52b95525aa16797ca2.zip | |
Auto merge of #67903 - Dylan-DPC:rollup-k9djyrf, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #67818 (rustdoc: Avoid panic when parsing codeblocks for playground links) - #67845 (Also remove const-hack for abs) - #67879 (Remove negative number check from float sqrt) - #67881 (Add backticks to various diagnostics) - #67882 (remove bespoke flock bindings) Failed merges: r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/num/mod.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 605ab98219f..b6b4a46e0b8 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -2001,6 +2001,9 @@ $EndFeature, " #[inline] #[rustc_inherit_overflow_checks] pub const fn abs(self) -> Self { + // Note that the #[inline] above means that the overflow + // semantics of the subtraction depend on the crate we're being + // inlined into. if self.is_negative() { -self } else { |