Auto merge of rust-lang#117126 - matthiaskrgr:rollup-8huie8f, r=matthiaskrgr

bors · bors · commit 418ba9efd2dd · 2023-10-24T17:28:45.000Z
Rollup of 5 pull requests Successful merges: - rust-lang#117081 (fix typos in comments) - rust-lang#117091 (`OptWithInfcx` naming nits, trait bound simplifications) - rust-lang#117092 (Add regression test for rust-lang#117058) - rust-lang#117093 (Update books) - rust-lang#117105 (remove change-id assertion in bootstrap test) r? `@ghost` `@rustbot` modify labels: rollup
diff --git a/core/src/num/mod.rs b/core/src/num/mod.rs
@@ -114,7 +114,7 @@ macro_rules! midpoint_impl {
                       without modifying the original"]
         #[inline]
         pub const fn midpoint(self, rhs: $SelfT) -> $SelfT {
-            // Use the well known branchless algorthim from Hacker's Delight to compute
+            // Use the well known branchless algorithm from Hacker's Delight to compute
             // `(a + b) / 2` without overflowing: `((a ^ b) >> 1) + (a & b)`.
             ((self ^ rhs) >> 1) + (self & rhs)
         }

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ macro_rules! midpoint_impl {`
`114`	`114`	`without modifying the original"]`
`115`	`115`	`#[inline]`
`116`	`116`	`pub const fn midpoint(self, rhs: $SelfT) -> $SelfT {`
`117`		`- // Use the well known branchless algorthim from Hacker's Delight to compute`
	`117`	`+ // Use the well known branchless algorithm from Hacker's Delight to compute`
`118`	`118`	// `(a + b) / 2` without overflowing: `((a ^ b) >> 1) + (a & b)`.
`119`	`119`	`((self ^ rhs) >> 1) + (self & rhs)`
`120`	`120`	`}`