diff options
| author | bors <bors@rust-lang.org> | 2024-11-22 10:54:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-22 10:54:22 +0000 |
| commit | f1e07524047cbc46501a429134e80505a7cd73c0 (patch) | |
| tree | ce29e47e8556899f283271538dc94c2a83b34bc7 /tests | |
| parent | 2cf7908998e5010ffdedede39f88fa2590e9c830 (diff) | |
| parent | de741d209382c6da125030c52500e57878932bc1 (diff) | |
| download | rust-f1e07524047cbc46501a429134e80505a7cd73c0.tar.gz rust-f1e07524047cbc46501a429134e80505a7cd73c0.zip | |
Auto merge of #130867 - michirakara:steps_between, r=dtolnay
distinguish overflow and unimplemented in Step::steps_between
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ui/impl-trait/example-calendar.rs | 2 | ||||
| -rw-r--r-- | tests/ui/issues/issue-48006.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/ui/impl-trait/example-calendar.rs b/tests/ui/impl-trait/example-calendar.rs index 1dadc5dfcb3..c3c01f01036 100644 --- a/tests/ui/impl-trait/example-calendar.rs +++ b/tests/ui/impl-trait/example-calendar.rs @@ -156,7 +156,7 @@ impl<'a, 'b> std::ops::Add<&'b NaiveDate> for &'a NaiveDate { } impl std::iter::Step for NaiveDate { - fn steps_between(_: &Self, _: &Self) -> Option<usize> { + fn steps_between(_: &Self, _: &Self) -> (usize, Option<usize>) { unimplemented!() } diff --git a/tests/ui/issues/issue-48006.rs b/tests/ui/issues/issue-48006.rs index e48146d07bc..1adc76f2a26 100644 --- a/tests/ui/issues/issue-48006.rs +++ b/tests/ui/issues/issue-48006.rs @@ -6,10 +6,10 @@ use std::iter::Step; #[cfg(target_pointer_width = "16")] fn main() { - assert!(Step::steps_between(&0u32, &u32::MAX).is_none()); + assert!(Step::steps_between(&0u32, &u32::MAX).1.is_none()); } #[cfg(any(target_pointer_width = "32", target_pointer_width = "64"))] fn main() { - assert!(Step::steps_between(&0u32, &u32::MAX).is_some()); + assert!(Step::steps_between(&0u32, &u32::MAX).1.is_some()); } |
