diff options
| author | bors <bors@rust-lang.org> | 2020-06-12 13:10:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-12 13:10:57 +0000 |
| commit | 7c78a5f97de07a185eebae5a5de436c80d8ba9d4 (patch) | |
| tree | e5475f282387bca43e2085d44537fdfbe69ef98d /src/liballoc/sync | |
| parent | 59493917be3e87e1dfb44a9ccb66a9f9b17228e6 (diff) | |
| parent | 77ede48ada25295cb90e520f52c1cbe653982f8a (diff) | |
| download | rust-7c78a5f97de07a185eebae5a5de436c80d8ba9d4.tar.gz rust-7c78a5f97de07a185eebae5a5de436c80d8ba9d4.zip | |
Auto merge of #73276 - Dylan-DPC:rollup-hfd81qw, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #72906 (Migrate to numeric associated consts) - #73178 (expand: More precise locations for expansion-time lints) - #73225 (Allow inference regions when relating consts) - #73236 (Clean up E0666 explanation) - #73273 (Fix Zulip pings) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc/sync')
| -rw-r--r-- | src/liballoc/sync/tests.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/liballoc/sync/tests.rs b/src/liballoc/sync/tests.rs index a2bb651e2b7..6f08cd7f123 100644 --- a/src/liballoc/sync/tests.rs +++ b/src/liballoc/sync/tests.rs @@ -465,14 +465,14 @@ fn test_from_vec() { fn test_downcast() { use std::any::Any; - let r1: Arc<dyn Any + Send + Sync> = Arc::new(i32::max_value()); + let r1: Arc<dyn Any + Send + Sync> = Arc::new(i32::MAX); let r2: Arc<dyn Any + Send + Sync> = Arc::new("abc"); assert!(r1.clone().downcast::<u32>().is_err()); let r1i32 = r1.downcast::<i32>(); assert!(r1i32.is_ok()); - assert_eq!(r1i32.unwrap(), Arc::new(i32::max_value())); + assert_eq!(r1i32.unwrap(), Arc::new(i32::MAX)); assert!(r2.clone().downcast::<i32>().is_err()); |
