diff options
| author | bors <bors@rust-lang.org> | 2017-11-29 12:17:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-29 12:17:45 +0000 |
| commit | 0a2e9ade83ff253bb489c63a95b1f499c5e0916f (patch) | |
| tree | 6fe2c8003b84d6e710ad6d57b77427b66b9c4ad4 /src/test/ui | |
| parent | dc0e227745765c198958f0298785d18bcf61d4ae (diff) | |
| parent | 51bd916af49dff0e88cf3cd01d507aa5fabc6cf8 (diff) | |
| download | rust-0a2e9ade83ff253bb489c63a95b1f499c5e0916f.tar.gz rust-0a2e9ade83ff253bb489c63a95b1f499c5e0916f.zip | |
Auto merge of #46362 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests - Successful merges: #45969, #46077, #46219, #46287, #46293, #46322, #46323, #46330, #46354, #46356 - Failed merges:
Diffstat (limited to 'src/test/ui')
| -rw-r--r-- | src/test/ui/span/dropck_arr_cycle_checked.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/span/dropck_vec_cycle_checked.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/span/vec-must-not-hide-type-from-dropck.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/test/ui/span/dropck_arr_cycle_checked.rs b/src/test/ui/span/dropck_arr_cycle_checked.rs index 995a198271c..455c9dc57f5 100644 --- a/src/test/ui/span/dropck_arr_cycle_checked.rs +++ b/src/test/ui/span/dropck_arr_cycle_checked.rs @@ -13,7 +13,7 @@ // // (Compare against compile-fail/dropck_vec_cycle_checked.rs) -#![feature(const_atomic_usize_new)] + use std::cell::Cell; use id::Id; diff --git a/src/test/ui/span/dropck_vec_cycle_checked.rs b/src/test/ui/span/dropck_vec_cycle_checked.rs index 5bcaa71f73c..5e7cb79680c 100644 --- a/src/test/ui/span/dropck_vec_cycle_checked.rs +++ b/src/test/ui/span/dropck_vec_cycle_checked.rs @@ -12,7 +12,7 @@ // // (Compare against compile-fail/dropck_arr_cycle_checked.rs) -#![feature(const_atomic_usize_new)] + use std::cell::Cell; use id::Id; diff --git a/src/test/ui/span/vec-must-not-hide-type-from-dropck.rs b/src/test/ui/span/vec-must-not-hide-type-from-dropck.rs index d99f3bb19db..c4596e7c368 100644 --- a/src/test/ui/span/vec-must-not-hide-type-from-dropck.rs +++ b/src/test/ui/span/vec-must-not-hide-type-from-dropck.rs @@ -23,7 +23,7 @@ // conditions above to be satisfied, meaning that if the dropck is // sound, it should reject this code. -#![feature(const_atomic_usize_new)] + use std::cell::Cell; use id::Id; |