Skip to content

Commit 4c6ddc0

Browse files
committedApr 16, 2023
fix library and rustdoc tests
·
1.88.01.71.0
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
 

‎library/alloc/tests/const_fns.rs

Lines changed: 11 additions & 8 deletions
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);

‎library/alloc/tests/lib.rs

Lines changed: 0 additions & 2 deletions
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)]

0 commit comments

Comments
 (0)
Please sign in to comment.