Skip to content

Commit 135ccba

Browse files
committed
Auto merge of #66908 - Centril:rollup-26givp6, r=Centril
Rollup of 9 pull requests Successful merges: - #66612 (Initial implementation of or-pattern usefulness checking) - #66705 (Atomic as_mut_ptr) - #66759 (impl TrustedLen for vec::Drain) - #66858 (Use LLVMAddAnalysisPasses instead of Rust's wrapper) - #66870 (SimplifyArmIdentity only for locals with the same type) - #66883 (rustc_typeck: gate AnonConst's generics on feature(const_generics).) - #66889 (Make python-generated source files compatible with rustfmt) - #66894 (Remove unneeded prelude imports in libcore tests) - #66895 (Feature gating *declarations* => new crate `rustc_feature`) Failed merges: - #66905 (rustc_plugin: Remove some remaining plugin features) r? @ghost
2 parents d8bdb3f + b772b5b commit 135ccba

File tree

93 files changed

+2255
-1785
lines changed

Some content is hidden

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

93 files changed

+2255
-1785
lines changed

Cargo.lock

+18
Original file line numberDiff line numberDiff line change
@@ -3199,6 +3199,7 @@ dependencies = [
31993199
"rustc_data_structures",
32003200
"rustc_error_codes",
32013201
"rustc_errors",
3202+
"rustc_feature",
32023203
"rustc_fs_util",
32033204
"rustc_index",
32043205
"rustc_macros",
@@ -3574,6 +3575,7 @@ dependencies = [
35743575
"rustc_data_structures",
35753576
"rustc_error_codes",
35763577
"rustc_errors",
3578+
"rustc_feature",
35773579
"rustc_interface",
35783580
"rustc_lint",
35793581
"rustc_metadata",
@@ -3607,6 +3609,15 @@ dependencies = [
36073609
"unicode-width",
36083610
]
36093611

3612+
[[package]]
3613+
name = "rustc_feature"
3614+
version = "0.0.0"
3615+
dependencies = [
3616+
"lazy_static 1.3.0",
3617+
"rustc_data_structures",
3618+
"syntax_pos",
3619+
]
3620+
36103621
[[package]]
36113622
name = "rustc_fs_util"
36123623
version = "0.0.0"
@@ -3682,6 +3693,7 @@ dependencies = [
36823693
"rustc",
36833694
"rustc_data_structures",
36843695
"rustc_error_codes",
3696+
"rustc_feature",
36853697
"rustc_index",
36863698
"rustc_target",
36873699
"syntax",
@@ -3786,6 +3798,7 @@ dependencies = [
37863798
"rustc_data_structures",
37873799
"rustc_error_codes",
37883800
"rustc_errors",
3801+
"rustc_feature",
37893802
"rustc_lexer",
37903803
"rustc_target",
37913804
"smallvec 1.0.0",
@@ -3802,6 +3815,7 @@ dependencies = [
38023815
"rustc_data_structures",
38033816
"rustc_error_codes",
38043817
"rustc_errors",
3818+
"rustc_feature",
38053819
"rustc_index",
38063820
"rustc_parse",
38073821
"rustc_target",
@@ -3844,6 +3858,7 @@ dependencies = [
38443858
"rustc_data_structures",
38453859
"rustc_error_codes",
38463860
"rustc_errors",
3861+
"rustc_feature",
38473862
"rustc_metadata",
38483863
"smallvec 1.0.0",
38493864
"syntax",
@@ -4442,6 +4457,7 @@ dependencies = [
44424457
"rustc_data_structures",
44434458
"rustc_error_codes",
44444459
"rustc_errors",
4460+
"rustc_feature",
44454461
"rustc_index",
44464462
"rustc_lexer",
44474463
"rustc_macros",
@@ -4458,6 +4474,7 @@ dependencies = [
44584474
"log",
44594475
"rustc_data_structures",
44604476
"rustc_errors",
4477+
"rustc_feature",
44614478
"rustc_lexer",
44624479
"rustc_parse",
44634480
"serialize",
@@ -4475,6 +4492,7 @@ dependencies = [
44754492
"rustc_data_structures",
44764493
"rustc_error_codes",
44774494
"rustc_errors",
4495+
"rustc_feature",
44784496
"rustc_parse",
44794497
"rustc_target",
44804498
"smallvec 1.0.0",

src/etc/dec2flt_table.py

100644100755
+10-5
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,18 @@ def print_proper_powers():
111111
print("pub const MIN_E: i16 = {};".format(MIN_E))
112112
print("pub const MAX_E: i16 = {};".format(MAX_E))
113113
print()
114+
print("#[rustfmt::skip]")
114115
typ = "([u64; {0}], [i16; {0}])".format(len(powers))
115-
print("pub const POWERS: ", typ, " = ([", sep='')
116+
print("pub const POWERS: ", typ, " = (", sep='')
117+
print(" [")
116118
for z in powers:
117-
print(" 0x{:x},".format(z.sig))
118-
print("], [")
119+
print(" 0x{:x},".format(z.sig))
120+
print(" ],")
121+
print(" [")
119122
for z in powers:
120-
print(" {},".format(z.exp))
121-
print("]);")
123+
print(" {},".format(z.exp))
124+
print(" ],")
125+
print(");")
122126

123127

124128
def print_short_powers(num_bits, significand_size):
@@ -127,6 +131,7 @@ def print_short_powers(num_bits, significand_size):
127131
max_e = int(ceil(log(max_sig, 5)))
128132
e_range = range(max_e)
129133
typ = "[f{}; {}]".format(num_bits, len(e_range))
134+
print("#[rustfmt::skip]")
130135
print("pub const F", num_bits, "_SHORT_POWERS: ", typ, " = [", sep='')
131136
for e in e_range:
132137
print(" 1e{},".format(e))

src/liballoc/vec.rs

+3
Original file line numberDiff line numberDiff line change
@@ -2703,6 +2703,9 @@ impl<T> ExactSizeIterator for Drain<'_, T> {
27032703
}
27042704
}
27052705

2706+
#[unstable(feature = "trusted_len", issue = "37572")]
2707+
unsafe impl<T> TrustedLen for Drain<'_, T> {}
2708+
27062709
#[stable(feature = "fused", since = "1.26.0")]
27072710
impl<T> FusedIterator for Drain<'_, T> {}
27082711

0 commit comments

Comments
 (0)