Skip to content

Commit f2d9393

Browse files
borsbors
committed
Auto merge of #98820 - RalfJung:rollup-i3mip9a, r=RalfJung
Rollup of 6 pull requests Successful merges: - #98701 (Add regression test for #50439) - #98715 (add ice test for #97047) - #98753 (Fix `x dist rust-dev` on a fresh checkout) - #98805 (Add #95469 to the release notes) - #98812 (feat: Add a documentation problem issue template) - #98819 (update Miri) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 750d6f8 + 434ce76 commit f2d9393

File tree

10 files changed

+147
-1
lines changed

10 files changed

+147
-1
lines changed

‎.github/ISSUE_TEMPLATE/documentation.md

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: Documentation problem
3+
about: Create a report for a documentation problem.
4+
labels: A-docs
5+
---
6+
<!--
7+
Thank you for finding a documentation problem! 📚
8+
9+
Documentation problems might be grammatical issues, typos, or unclear wording, please provide details regarding the documentation including where it is present.
10+
11+
-->
12+
13+
### Location
14+
15+
### Summary
16+

‎RELEASES.md

+3
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ Compatibility Notes
7878
- [rustdoc: doctests are now run on unexported `macro_rules!` macros, matching other private items][96630]
7979
- [rustdoc: Remove .woff font files][96279]
8080
- [Enforce Copy bounds for repeat elements while considering lifetimes][95819]
81+
- [Windows: Fix potentinal unsoundness by aborting if `File` reads or writes cannot
82+
complete synchronously][95469].
8183

8284
Internal Changes
8385
----------------
@@ -99,6 +101,7 @@ and related tools.
99101
[95372]: https://github.com/rust-lang/rust/pull/95372/
100102
[95380]: https://github.com/rust-lang/rust/pull/95380/
101103
[95431]: https://github.com/rust-lang/rust/pull/95431/
104+
[95469]: https://github.com/rust-lang/rust/pull/95469/
102105
[95705]: https://github.com/rust-lang/rust/pull/95705/
103106
[95801]: https://github.com/rust-lang/rust/pull/95801/
104107
[95819]: https://github.com/rust-lang/rust/pull/95819/

‎src/bootstrap/dist.rs

+2
Original file line numberDiff line numberDiff line change
@@ -2025,6 +2025,8 @@ impl Step for RustDev {
20252025
let mut tarball = Tarball::new(builder, "rust-dev", &target.triple);
20262026
tarball.set_overlay(OverlayKind::LLVM);
20272027

2028+
builder.ensure(crate::native::Llvm { target });
2029+
20282030
let src_bindir = builder.llvm_out(target).join("bin");
20292031
// If updating this list, you likely want to change
20302032
// src/bootstrap/download-ci-llvm-stamp as well, otherwise local users

‎src/test/ui/const-generics/generic_const_exprs/issue-97047-ice-1.rs

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// check-pass
2+
3+
#![feature(adt_const_params, generic_const_exprs)]
4+
//~^ WARN the feature `adt_const_params` is incomplete and may not be safe to use and/or cause compiler crashes [incomplete_features]
5+
//~^^ WARN the feature `generic_const_exprs` is incomplete and may not be safe to use and/or cause compiler crashes [incomplete_features]
6+
7+
pub struct Changes<const CHANGES: &'static [&'static str]>
8+
where
9+
[(); CHANGES.len()]:,
10+
{
11+
changes: [usize; CHANGES.len()],
12+
}
13+
14+
impl<const CHANGES: &'static [&'static str]> Changes<CHANGES>
15+
where
16+
[(); CHANGES.len()]:,
17+
{
18+
pub const fn new() -> Self {
19+
Self {
20+
changes: [0; CHANGES.len()],
21+
}
22+
}
23+
}
24+
25+
pub fn main() {}

‎src/test/ui/const-generics/generic_const_exprs/issue-97047-ice-1.stderr

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
warning: the feature `adt_const_params` is incomplete and may not be safe to use and/or cause compiler crashes
2+
--> $DIR/issue-97047-ice-1.rs:3:12
3+
|
4+
LL | #![feature(adt_const_params, generic_const_exprs)]
5+
| ^^^^^^^^^^^^^^^^
6+
|
7+
= note: `#[warn(incomplete_features)]` on by default
8+
= note: see issue #95174 <https://github.com/rust-lang/rust/issues/95174> for more information
9+
10+
warning: the feature `generic_const_exprs` is incomplete and may not be safe to use and/or cause compiler crashes
11+
--> $DIR/issue-97047-ice-1.rs:3:30
12+
|
13+
LL | #![feature(adt_const_params, generic_const_exprs)]
14+
| ^^^^^^^^^^^^^^^^^^^
15+
|
16+
= note: see issue #76560 <https://github.com/rust-lang/rust/issues/76560> for more information
17+
18+
warning: 2 warnings emitted
19+

‎src/test/ui/const-generics/generic_const_exprs/issue-97047-ice-2.rs

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
// check-pass
2+
3+
#![feature(adt_const_params, generic_const_exprs)]
4+
//~^ WARN the feature `adt_const_params` is incomplete and may not be safe to use and/or cause compiler crashes [incomplete_features]
5+
//~^^ WARN the feature `generic_const_exprs` is incomplete and may not be safe to use and/or cause compiler crashes [incomplete_features]
6+
7+
pub struct Changes<const CHANGES: &'static [&'static str]>
8+
where
9+
[(); CHANGES.len()]:,
10+
{
11+
changes: [usize; CHANGES.len()],
12+
}
13+
14+
impl<const CHANGES: &'static [&'static str]> Changes<CHANGES>
15+
where
16+
[(); CHANGES.len()]:,
17+
{
18+
pub fn combine(&mut self, other: &Self) {
19+
for _change in &self.changes {}
20+
}
21+
}
22+
23+
pub fn main() {}

‎src/test/ui/const-generics/generic_const_exprs/issue-97047-ice-2.stderr

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
warning: the feature `adt_const_params` is incomplete and may not be safe to use and/or cause compiler crashes
2+
--> $DIR/issue-97047-ice-2.rs:3:12
3+
|
4+
LL | #![feature(adt_const_params, generic_const_exprs)]
5+
| ^^^^^^^^^^^^^^^^
6+
|
7+
= note: `#[warn(incomplete_features)]` on by default
8+
= note: see issue #95174 <https://github.com/rust-lang/rust/issues/95174> for more information
9+
10+
warning: the feature `generic_const_exprs` is incomplete and may not be safe to use and/or cause compiler crashes
11+
--> $DIR/issue-97047-ice-2.rs:3:30
12+
|
13+
LL | #![feature(adt_const_params, generic_const_exprs)]
14+
| ^^^^^^^^^^^^^^^^^^^
15+
|
16+
= note: see issue #76560 <https://github.com/rust-lang/rust/issues/76560> for more information
17+
18+
warning: 2 warnings emitted
19+

‎src/test/ui/consts/issue-50439.rs

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#![feature(specialization)]
2+
#![allow(incomplete_features)]
3+
4+
pub trait ReflectDrop {
5+
const REFLECT_DROP: bool = false;
6+
}
7+
8+
impl<T> ReflectDrop for T where T: Clone {}
9+
10+
pub trait PinDropInternal {
11+
fn is_valid()
12+
where
13+
Self: ReflectDrop;
14+
}
15+
16+
struct Bears<T>(T);
17+
18+
default impl<T> ReflectDrop for Bears<T> {}
19+
20+
impl<T: Sized> PinDropInternal for Bears<T> {
21+
fn is_valid()
22+
where
23+
Self: ReflectDrop,
24+
{
25+
let _ = [(); 0 - !!(<Bears<T> as ReflectDrop>::REFLECT_DROP) as usize]; //~ ERROR constant expression depends on a generic parameter
26+
}
27+
}
28+
29+
fn main() {}

‎src/test/ui/consts/issue-50439.stderr

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
error: constant expression depends on a generic parameter
2+
--> $DIR/issue-50439.rs:25:22
3+
|
4+
LL | let _ = [(); 0 - !!(<Bears<T> as ReflectDrop>::REFLECT_DROP) as usize];
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
|
7+
= note: this may fail depending on what value the parameter takes
8+
9+
error: aborting due to previous error
10+

‎src/tools/miri

Submodule miri updated 381 files

0 commit comments

Comments
 (0)