Skip to content

Commit 4c6ddc0

Browse files
fee1-deadfee1-dead
committed
fix library and rustdoc tests
1 parent 147e850 commit 4c6ddc0

File tree

108 files changed

+839
-442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

108 files changed

+839
-442
lines changed

Diff for: ‎library/alloc/tests/const_fns.rs

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
// Test const functions in the library
22

33
pub const MY_VEC: Vec<usize> = Vec::new();
4-
pub const MY_VEC2: Vec<usize> = Default::default();
4+
5+
// FIXME(#110395)
6+
// pub const MY_VEC2: Vec<usize> = Default::default();
57

68
pub const MY_STRING: String = String::new();
7-
pub const MY_STRING2: String = Default::default();
89

9-
pub const MY_BOXED_SLICE: Box<[usize]> = Default::default();
10-
pub const MY_BOXED_STR: Box<str> = Default::default();
10+
// pub const MY_STRING2: String = Default::default();
11+
12+
// pub const MY_BOXED_SLICE: Box<[usize]> = Default::default();
13+
// pub const MY_BOXED_STR: Box<str> = Default::default();
1114

1215
use std::collections::{BTreeMap, BTreeSet};
1316

@@ -23,11 +26,11 @@ pub const SET_IS_EMPTY: bool = SET.is_empty();
2326

2427
#[test]
2528
fn test_const() {
26-
assert_eq!(MY_VEC, MY_VEC2);
27-
assert_eq!(MY_STRING, MY_STRING2);
29+
assert_eq!(MY_VEC, /* MY_VEC */ vec![]);
30+
assert_eq!(MY_STRING, /* MY_STRING2 */ String::default());
2831

29-
assert_eq!(MY_VEC, *MY_BOXED_SLICE);
30-
assert_eq!(MY_STRING, *MY_BOXED_STR);
32+
// assert_eq!(MY_VEC, *MY_BOXED_SLICE);
33+
// assert_eq!(MY_STRING, *MY_BOXED_STR);
3134

3235
assert_eq!(MAP_LEN, 0);
3336
assert_eq!(SET_LEN, 0);

Diff for: ‎library/alloc/tests/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
#![feature(assert_matches)]
44
#![feature(btree_drain_filter)]
55
#![feature(cow_is_borrowed)]
6-
#![feature(const_convert)]
76
#![feature(const_cow_is_borrowed)]
87
#![feature(const_heap)]
98
#![feature(const_mut_refs)]
@@ -33,7 +32,6 @@
3332
#![feature(slice_partition_dedup)]
3433
#![feature(string_remove_matches)]
3534
#![feature(const_btree_len)]
36-
#![feature(const_default_impls)]
3735
#![feature(const_trait_impl)]
3836
#![feature(const_str_from_utf8)]
3937
#![feature(panic_update_hook)]

Diff for: ‎library/core/tests/atomic.rs

+2
Original file line numberDiff line numberDiff line change
@@ -306,9 +306,11 @@ fn atomic_compare_exchange() {
306306
ATOMIC.compare_exchange_weak(0, 1, SeqCst, SeqCst).ok();
307307
}
308308

309+
/* FIXME(#110395)
309310
#[test]
310311
fn atomic_const_from() {
311312
const _ATOMIC_U8: AtomicU8 = AtomicU8::from(1);
312313
const _ATOMIC_BOOL: AtomicBool = AtomicBool::from(true);
313314
const _ATOMIC_PTR: AtomicPtr<u32> = AtomicPtr::from(core::ptr::null_mut());
314315
}
316+
*/

Diff for: ‎library/core/tests/bool.rs

+2
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ fn test_bool_to_option() {
8989
assert_eq!(false.then(|| 0), None);
9090
assert_eq!(true.then(|| 0), Some(0));
9191

92+
/* FIXME(#110395)
9293
const fn zero() -> i32 {
9394
0
9495
}
@@ -102,4 +103,5 @@ fn test_bool_to_option() {
102103
assert_eq!(B, Some(0));
103104
assert_eq!(C, None);
104105
assert_eq!(D, Some(0));
106+
*/
105107
}

Diff for: ‎library/core/tests/cell.rs

+2
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,7 @@ fn const_cells() {
468468
const CELL: Cell<i32> = Cell::new(3);
469469
const _: i32 = CELL.into_inner();
470470

471+
/* FIXME(#110395)
471472
const UNSAFE_CELL_FROM: UnsafeCell<i32> = UnsafeCell::from(3);
472473
const _: i32 = UNSAFE_CELL.into_inner();
473474
@@ -476,4 +477,5 @@ fn const_cells() {
476477
477478
const CELL_FROM: Cell<i32> = Cell::from(3);
478479
const _: i32 = CELL.into_inner();
480+
*/
479481
}

Diff for: ‎library/core/tests/char.rs

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ fn test_convert() {
2121
assert!(char::try_from(0xFFFF_FFFF_u32).is_err());
2222
}
2323

24+
/* FIXME(#110395)
2425
#[test]
2526
const fn test_convert_const() {
2627
assert!(u32::from('a') == 0x61);
@@ -30,6 +31,7 @@ const fn test_convert_const() {
3031
assert!(char::from(b'a') == 'a');
3132
assert!(char::from(b'\xFF') == '\u{FF}');
3233
}
34+
*/
3335

3436
#[test]
3537
fn test_from_str() {

Diff for: ‎library/core/tests/cmp.rs

+2
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ fn cmp_default() {
217217
assert_eq!(Fool(false), Fool(true));
218218
}
219219

220+
/* FIXME(#110395)
220221
mod const_cmp {
221222
use super::*;
222223
@@ -248,3 +249,4 @@ mod const_cmp {
248249
const _: () = assert!(S(0) < S(1));
249250
const _: () = assert!(S(1) > S(0));
250251
}
252+
*/

Diff for: ‎library/core/tests/convert.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* FIXME(#110395)
12
#[test]
23
fn convert() {
34
const fn from(x: i32) -> i32 {
@@ -14,3 +15,4 @@ fn convert() {
1415
const BAR: Vec<String> = into(Vec::new());
1516
assert_eq!(BAR, Vec::<String>::new());
1617
}
18+
*/

Diff for: ‎library/core/tests/hash/mod.rs

+7-5
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@ impl Hasher for MyHasher {
3535

3636
#[test]
3737
fn test_writer_hasher() {
38-
const fn hash<T: Hash>(t: &T) -> u64 {
38+
// FIXME(#110395)
39+
/* const */ fn hash<T: Hash>(t: &T) -> u64 {
3940
let mut s = MyHasher { hash: 0 };
4041
t.hash(&mut s);
4142
s.finish()
4243
}
4344

44-
const {
45+
/* const {
4546
// FIXME(fee1-dead): assert_eq
4647
assert!(hash(&()) == 0);
4748
assert!(hash(&5_u8) == 5);
@@ -52,7 +53,7 @@ fn test_writer_hasher() {
5253
5354
let s: &str = "a";
5455
assert!(hash(&s) == 97 + 0xFF);
55-
};
56+
}; */
5657

5758
assert_eq!(hash(&()), 0);
5859

@@ -139,15 +140,16 @@ impl Hash for Custom {
139140

140141
#[test]
141142
fn test_custom_state() {
142-
const fn hash<T: Hash>(t: &T) -> u64 {
143+
// FIXME(#110395)
144+
/* const */ fn hash<T: Hash>(t: &T) -> u64 {
143145
let mut c = CustomHasher { output: 0 };
144146
t.hash(&mut c);
145147
c.finish()
146148
}
147149

148150
assert_eq!(hash(&Custom { hash: 5 }), 5);
149151

150-
const { assert!(hash(&Custom { hash: 6 }) == 6) };
152+
// const { assert!(hash(&Custom { hash: 6 }) == 6) };
151153
}
152154

153155
// FIXME: Instantiated functions with i128 in the signature is not supported in Emscripten.

Diff for: ‎library/core/tests/hash/sip.rs

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ fn hash<T: Hash>(x: &T) -> u64 {
2323
hash_with(SipHasher::new(), x)
2424
}
2525

26+
/* FIXME(#110395)
2627
#[test]
2728
const fn test_const_sip() {
2829
let val1 = 0x45;
@@ -36,6 +37,7 @@ const fn test_const_sip() {
3637
3738
assert!(const_hash(&(val1)) != const_hash(&(val2)));
3839
}
40+
*/
3941

4042
#[test]
4143
#[allow(unused_must_use)]

Diff for: ‎library/core/tests/lazy.rs

+2
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,13 @@ fn unsync_once_cell_drop_empty() {
4646
drop(x);
4747
}
4848

49+
/* FIXME(#110395)
4950
#[test]
5051
const fn once_cell_const() {
5152
let _once_cell: OnceCell<u32> = OnceCell::new();
5253
let _once_cell: OnceCell<u32> = OnceCell::from(32);
5354
}
55+
*/
5456

5557
#[test]
5658
fn clone() {

Diff for: ‎library/core/tests/lib.rs

-3
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,13 @@
88
#![feature(const_assume)]
99
#![feature(const_align_of_val_raw)]
1010
#![feature(const_black_box)]
11-
#![feature(const_bool_to_option)]
1211
#![feature(const_caller_location)]
1312
#![feature(const_cell_into_inner)]
14-
#![feature(const_convert)]
1513
#![feature(const_hash)]
1614
#![feature(const_heap)]
1715
#![feature(const_maybe_uninit_as_mut_ptr)]
1816
#![feature(const_maybe_uninit_assume_init_read)]
1917
#![feature(const_nonnull_new)]
20-
#![feature(const_num_from_num)]
2118
#![feature(const_pointer_byte_offsets)]
2219
#![feature(const_pointer_is_aligned)]
2320
#![feature(const_ptr_as_ref)]

Diff for: ‎library/core/tests/nonzero.rs

+2
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,13 @@ fn nonzero_const() {
215215
const ONE: Option<NonZeroU8> = NonZeroU8::new(1);
216216
assert!(ONE.is_some());
217217

218+
/* FIXME(#110395)
218219
const FROM_NONZERO_U8: u8 = u8::from(NONZERO_U8);
219220
assert_eq!(FROM_NONZERO_U8, 5);
220221
221222
const NONZERO_CONVERT: NonZeroU32 = NonZeroU32::from(NONZERO_U8);
222223
assert_eq!(NONZERO_CONVERT.get(), 5);
224+
*/
223225
}
224226

225227
#[test]

Diff for: ‎library/core/tests/num/const_from.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* FIXME(#110395)
12
#[test]
23
fn from() {
34
use core::convert::TryFrom;
@@ -23,3 +24,4 @@ fn from() {
2324
const I16_FROM_U16: Result<i16, TryFromIntError> = i16::try_from(1u16);
2425
assert_eq!(I16_FROM_U16, Ok(1i16));
2526
}
27+
*/

Diff for: ‎library/core/tests/option.rs

+19-5
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ fn test_and() {
8888
assert_eq!(x.and(Some(2)), None);
8989
assert_eq!(x.and(None::<isize>), None);
9090

91+
/* FIXME(#110395)
9192
const FOO: Option<isize> = Some(1);
9293
const A: Option<isize> = FOO.and(Some(2));
9394
const B: Option<isize> = FOO.and(None);
@@ -99,6 +100,7 @@ fn test_and() {
99100
const D: Option<isize> = BAR.and(None);
100101
assert_eq!(C, None);
101102
assert_eq!(D, None);
103+
*/
102104
}
103105

104106
#[test]
@@ -119,6 +121,7 @@ fn test_and_then() {
119121
assert_eq!(x.and_then(plus_one), None);
120122
assert_eq!(x.and_then(none), None);
121123

124+
/* FIXME(#110395)
122125
const FOO: Option<isize> = Some(1);
123126
const A: Option<isize> = FOO.and_then(plus_one);
124127
const B: Option<isize> = FOO.and_then(none);
@@ -130,6 +133,7 @@ fn test_and_then() {
130133
const D: Option<isize> = BAR.and_then(none);
131134
assert_eq!(C, None);
132135
assert_eq!(D, None);
136+
*/
133137
}
134138

135139
#[test]
@@ -142,6 +146,7 @@ fn test_or() {
142146
assert_eq!(x.or(Some(2)), Some(2));
143147
assert_eq!(x.or(None), None);
144148

149+
/* FIXME(#110395)
145150
const FOO: Option<isize> = Some(1);
146151
const A: Option<isize> = FOO.or(Some(2));
147152
const B: Option<isize> = FOO.or(None);
@@ -153,6 +158,7 @@ fn test_or() {
153158
const D: Option<isize> = BAR.or(None);
154159
assert_eq!(C, Some(2));
155160
assert_eq!(D, None);
161+
*/
156162
}
157163

158164
#[test]
@@ -173,6 +179,7 @@ fn test_or_else() {
173179
assert_eq!(x.or_else(two), Some(2));
174180
assert_eq!(x.or_else(none), None);
175181

182+
/* FIXME(#110395)
176183
const FOO: Option<isize> = Some(1);
177184
const A: Option<isize> = FOO.or_else(two);
178185
const B: Option<isize> = FOO.or_else(none);
@@ -184,6 +191,7 @@ fn test_or_else() {
184191
const D: Option<isize> = BAR.or_else(none);
185192
assert_eq!(C, Some(2));
186193
assert_eq!(D, None);
194+
*/
187195
}
188196

189197
#[test]
@@ -215,10 +223,12 @@ fn test_unwrap_or() {
215223
let x: Option<isize> = None;
216224
assert_eq!(x.unwrap_or(2), 2);
217225

226+
/* FIXME(#110395)
218227
const A: isize = Some(1).unwrap_or(2);
219228
const B: isize = None.unwrap_or(2);
220229
assert_eq!(A, 1);
221230
assert_eq!(B, 2);
231+
*/
222232
}
223233

224234
#[test]
@@ -233,10 +243,12 @@ fn test_unwrap_or_else() {
233243
let x: Option<isize> = None;
234244
assert_eq!(x.unwrap_or_else(two), 2);
235245

246+
/* FIXME(#110395)
236247
const A: isize = Some(1).unwrap_or_else(two);
237248
const B: isize = None.unwrap_or_else(two);
238249
assert_eq!(A, 1);
239250
assert_eq!(B, 2);
251+
*/
240252
}
241253

242254
#[test]
@@ -439,14 +451,15 @@ fn option_const() {
439451
const OPTION: Option<usize> = Some(32);
440452
assert_eq!(OPTION, Some(32));
441453

442-
const OPTION_FROM: Option<usize> = Option::from(32);
443-
assert_eq!(OPTION_FROM, Some(32));
454+
// FIXME(#110395)
455+
// const OPTION_FROM: Option<usize> = Option::from(32);
456+
// assert_eq!(OPTION_FROM, Some(32));
444457

445458
const REF: Option<&usize> = OPTION.as_ref();
446459
assert_eq!(REF, Some(&32));
447460

448-
const REF_FROM: Option<&usize> = Option::from(&OPTION);
449-
assert_eq!(REF_FROM, Some(&32));
461+
// const REF_FROM: Option<&usize> = Option::from(&OPTION);
462+
// assert_eq!(REF_FROM, Some(&32));
450463

451464
const IS_SOME: bool = OPTION.is_some();
452465
assert!(IS_SOME);
@@ -474,14 +487,15 @@ const fn option_const_mut() {
474487
None => unreachable!(),
475488
}
476489
}
477-
490+
/* FIXME(const-hack)
478491
{
479492
let as_mut: Option<&mut usize> = Option::from(&mut option);
480493
match as_mut {
481494
Some(v) => *v = 42,
482495
None => unreachable!(),
483496
}
484497
}
498+
*/
485499
}
486500

487501
#[test]

0 commit comments

Comments
 (0)