Rollup merge of #127303 - cuishuang:master, r=jhpratt · model-checking/verify-rust-std@de4f5c2 (original) (raw)

2 files changed

lines changed

Original file line number	Diff line number	Diff line change
@@ -189,7 +189,7 @@ pub const unsafe fn unreachable_unchecked() -> ! {
189	189	/// ```
190	190	///
191	191	/// This example is quite unlike anything that would be used in the real world: it is redundant
192		-/// to put an an assertion right next to code that checks the same thing, and dereferencing a
	192	+/// to put an assertion right next to code that checks the same thing, and dereferencing a
193	193	/// pointer already has the builtin assumption that it is nonnull. However, it illustrates the
194	194	/// kind of changes the optimizer can make even when the behavior is less obviously related.
195	195	#[track_caller]

Original file line number	Diff line number	Diff line change
@@ -200,7 +200,7 @@ fn logical_merge<T, F: FnMut(&T, &T) -> bool>(
200	200	// If one or both of the runs are sorted do a physical merge, using
201	201	// quicksort to sort the unsorted run if present. We also need to
202	202	// physically merge if the combined runs would not fit in the scratch space
203		-// anymore (as this would mean we are no longer able to to quicksort them).
	203	+// anymore (as this would mean we are no longer able to quicksort them).
204	204	let len = v.len();
205	205	let can_fit_in_scratch = len <= scratch.len();
206	206	if !can_fit_in_scratch \|	left.sorted()