Skip to content

Commit fb4aebd

Browse files
borsbors
committed
Auto merge of #131069 - matthiaskrgr:rollup-jg1icf9, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #131023 (Copy correct path to clipboard for modules/keywords/primitives) - #131035 (Preserve brackets around if-lets and skip while-lets) - #131038 (Fix `adt_const_params` leaking `{type error}` in error msg) - #131053 (Improve `--print=check-cfg` documentation) - #131056 (enable compiler fingerprint logs in verbose mode) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 63a0bdd + fd67755 commit fb4aebd

File tree

75 files changed

+322
-347
lines changed

Some content is hidden

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

75 files changed

+322
-347
lines changed

Diff for: ‎compiler/rustc_hir_analysis/src/check/wfcheck.rs

+12-5
Original file line numberDiff line numberDiff line change
@@ -961,13 +961,20 @@ fn check_param_wf(tcx: TyCtxt<'_>, param: &hir::GenericParam<'_>) -> Result<(),
961961
hir_ty.span,
962962
"using raw pointers as const generic parameters is forbidden",
963963
),
964-
_ => tcx.dcx().struct_span_err(
965-
hir_ty.span,
966-
format!("`{}` is forbidden as the type of a const generic parameter", ty),
967-
),
964+
_ => {
965+
// Avoid showing "{type error}" to users. See #118179.
966+
ty.error_reported()?;
967+
968+
tcx.dcx().struct_span_err(
969+
hir_ty.span,
970+
format!(
971+
"`{ty}` is forbidden as the type of a const generic parameter",
972+
),
973+
)
974+
}
968975
};
969976

970-
diag.note("the only supported types are integers, `bool` and `char`");
977+
diag.note("the only supported types are integers, `bool`, and `char`");
971978

972979
let cause = ObligationCause::misc(hir_ty.span, param.def_id);
973980
let adt_const_params_feature_string =

Diff for: ‎compiler/rustc_lint/src/if_let_rescope.rs

+28-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,11 @@ impl IfLetRescope {
122122
}
123123
let tcx = cx.tcx;
124124
let source_map = tcx.sess.source_map();
125-
let expr_end = expr.span.shrink_to_hi();
125+
let expr_end = match expr.kind {
126+
hir::ExprKind::If(_cond, conseq, None) => conseq.span.shrink_to_hi(),
127+
hir::ExprKind::If(_cond, _conseq, Some(alt)) => alt.span.shrink_to_hi(),
128+
_ => return,
129+
};
126130
let mut add_bracket_to_match_head = match_head_needs_bracket(tcx, expr);
127131
let mut significant_droppers = vec![];
128132
let mut lifetime_ends = vec![];
@@ -145,7 +149,10 @@ impl IfLetRescope {
145149
recovered: Recovered::No,
146150
}) = cond.kind
147151
{
148-
let if_let_pat = expr.span.shrink_to_lo().between(init.span);
152+
// Peel off round braces
153+
let if_let_pat = source_map
154+
.span_take_while(expr.span, |&ch| ch == '(' || ch.is_whitespace())
155+
.between(init.span);
149156
// The consequent fragment is always a block.
150157
let before_conseq = conseq.span.shrink_to_lo();
151158
let lifetime_end = source_map.end_point(conseq.span);
@@ -159,6 +166,8 @@ impl IfLetRescope {
159166
if ty_ascription.is_some()
160167
|| !expr.span.can_be_used_for_suggestions()
161168
|| !pat.span.can_be_used_for_suggestions()
169+
|| !if_let_pat.can_be_used_for_suggestions()
170+
|| !before_conseq.can_be_used_for_suggestions()
162171
{
163172
// Our `match` rewrites does not support type ascription,
164173
// so we just bail.
@@ -240,6 +249,23 @@ impl<'tcx> LateLintPass<'tcx> for IfLetRescope {
240249
if let (Level::Allow, _) = cx.tcx.lint_level_at_node(IF_LET_RESCOPE, expr.hir_id) {
241250
return;
242251
}
252+
if let hir::ExprKind::Loop(block, _label, hir::LoopSource::While, _span) = expr.kind
253+
&& let Some(value) = block.expr
254+
&& let hir::ExprKind::If(cond, _conseq, _alt) = value.kind
255+
&& let hir::ExprKind::Let(..) = cond.kind
256+
{
257+
// Recall that `while let` is lowered into this:
258+
// ```
259+
// loop {
260+
// if let .. { body } else { break; }
261+
// }
262+
// ```
263+
// There is no observable change in drop order on the overall `if let` expression
264+
// given that the `{ break; }` block is trivial so the edition change
265+
// means nothing substantial to this `while` statement.
266+
self.skip.insert(value.hir_id);
267+
return;
268+
}
243269
if expr_parent_is_stmt(cx.tcx, expr.hir_id)
244270
&& matches!(expr.kind, hir::ExprKind::If(_cond, _conseq, None))
245271
{

Diff for: ‎src/bootstrap/src/core/builder.rs

+5
Original file line numberDiff line numberDiff line change
@@ -2014,6 +2014,11 @@ impl<'a> Builder<'a> {
20142014
cargo.env("RUSTC_BACKTRACE_ON_ICE", "1");
20152015
}
20162016

2017+
if self.is_verbose() {
2018+
// This provides very useful logs especially when debugging build cache-related stuff.
2019+
cargo.env("CARGO_LOG", "cargo::core::compiler::fingerprint=info");
2020+
}
2021+
20172022
cargo.env("RUSTC_VERBOSE", self.verbosity.to_string());
20182023

20192024
// Downstream forks of the Rust compiler might want to use a custom libc to add support for

Diff for: ‎src/doc/unstable-book/src/compiler-flags/print-check-cfg.md

+16-11
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,28 @@ The tracking issue for this feature is: [#125704](https://github.com/rust-lang/r
44

55
------------------------
66

7-
This option of the `--print` flag print the list of expected cfgs.
7+
This option of the `--print` flag print the list of all the expected cfgs.
88

9-
This is related to the `--check-cfg` flag which allows specifying arbitrary expected
9+
This is related to the [`--check-cfg` flag][check-cfg] which allows specifying arbitrary expected
1010
names and values.
1111

12-
This print option works similarly to `--print=cfg` (modulo check-cfg specifics):
13-
- *check_cfg syntax*: *output of --print=check-cfg*
14-
- `cfg(windows)`: `windows`
15-
- `cfg(feature, values("foo", "bar"))`: `feature="foo"` and `feature="bar"`
16-
- `cfg(feature, values(none(), ""))`: `feature` and `feature=""`
17-
- `cfg(feature, values(any()))`: `feature=any()`
18-
- `cfg(feature, values())`: `feature=`
19-
- `cfg(any())`: `any()`
20-
- *nothing*: `any()=any()`
12+
This print option works similarly to `--print=cfg` (modulo check-cfg specifics).
13+
14+
| `--check-cfg` | `--print=check-cfg` |
15+
|-----------------------------------|-----------------------------|
16+
| `cfg(foo)` | `foo` |
17+
| `cfg(foo, values("bar"))` | `foo="bar"` |
18+
| `cfg(foo, values(none(), "bar"))` | `foo` & `foo="bar"` |
19+
| | *check-cfg specific syntax* |
20+
| `cfg(foo, values(any())` | `foo=any()` |
21+
| `cfg(foo, values())` | `foo=` |
22+
| `cfg(any())` | `any()` |
23+
| *none* | `any()=any()` |
2124

2225
To be used like this:
2326

2427
```bash
2528
rustc --print=check-cfg -Zunstable-options lib.rs
2629
```
30+
31+
[check-cfg]: https://doc.rust-lang.org/nightly/rustc/check-cfg.html

Diff for: ‎src/librustdoc/html/static/js/main.js

+9-5
Original file line numberDiff line numberDiff line change
@@ -1828,11 +1828,15 @@ href="https://doc.rust-lang.org/${channel}/rustdoc/read-documentation/search.htm
18281828
return;
18291829
}
18301830
but.onclick = () => {
1831-
const path = [];
1832-
onEachLazy(document.querySelectorAll(".rustdoc-breadcrumbs a"), a => {
1833-
path.push(a.textContent);
1834-
});
1835-
path.push(document.querySelector("title").textContent.split(" ")[0]);
1831+
// Most page titles are '<Item> in <path::to::module> - Rust', except
1832+
// modules (which don't have the first part) and keywords/primitives
1833+
// (which don't have a module path)
1834+
const title = document.querySelector("title").textContent.replace(" - Rust", "");
1835+
const [item, module] = title.split(" in ");
1836+
const path = [item];
1837+
if (module !== undefined) {
1838+
path.unshift(module);
1839+
}
18361840

18371841
copyContentToClipboard(path.join("::"));
18381842
copyButtonAnimation(but);

Diff for: ‎tests/ui/const-generics/adt_const_params/suggest_feature_only_when_possible.stderr

+9-9
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ error: `&'static mut ()` is forbidden as the type of a const generic parameter
44
LL | fn uwu_0<const N: &'static mut ()>() {}
55
| ^^^^^^^^^^^^^^^
66
|
7-
= note: the only supported types are integers, `bool` and `char`
7+
= note: the only supported types are integers, `bool`, and `char`
88

99
error: `&'static u32` is forbidden as the type of a const generic parameter
1010
--> $DIR/suggest_feature_only_when_possible.rs:15:19
1111
|
1212
LL | fn owo_0<const N: &'static u32>() {}
1313
| ^^^^^^^^^^^^
1414
|
15-
= note: the only supported types are integers, `bool` and `char`
15+
= note: the only supported types are integers, `bool`, and `char`
1616
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
1717
|
1818
LL + #![feature(adt_const_params)]
@@ -28,7 +28,7 @@ error: `Meow` is forbidden as the type of a const generic parameter
2828
LL | fn meow_0<const N: Meow>() {}
2929
| ^^^^
3030
|
31-
= note: the only supported types are integers, `bool` and `char`
31+
= note: the only supported types are integers, `bool`, and `char`
3232
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
3333
|
3434
LL + #![feature(adt_const_params)]
@@ -40,7 +40,7 @@ error: `&'static Meow` is forbidden as the type of a const generic parameter
4040
LL | fn meow_1<const N: &'static Meow>() {}
4141
| ^^^^^^^^^^^^^
4242
|
43-
= note: the only supported types are integers, `bool` and `char`
43+
= note: the only supported types are integers, `bool`, and `char`
4444
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
4545
|
4646
LL + #![feature(adt_const_params)]
@@ -56,39 +56,39 @@ error: `[Meow; 100]` is forbidden as the type of a const generic parameter
5656
LL | fn meow_2<const N: [Meow; 100]>() {}
5757
| ^^^^^^^^^^^
5858
|
59-
= note: the only supported types are integers, `bool` and `char`
59+
= note: the only supported types are integers, `bool`, and `char`
6060

6161
error: `(Meow, u8)` is forbidden as the type of a const generic parameter
6262
--> $DIR/suggest_feature_only_when_possible.rs:29:20
6363
|
6464
LL | fn meow_3<const N: (Meow, u8)>() {}
6565
| ^^^^^^^^^^
6666
|
67-
= note: the only supported types are integers, `bool` and `char`
67+
= note: the only supported types are integers, `bool`, and `char`
6868

6969
error: `(Meow, String)` is forbidden as the type of a const generic parameter
7070
--> $DIR/suggest_feature_only_when_possible.rs:34:20
7171
|
7272
LL | fn meow_4<const N: (Meow, String)>() {}
7373
| ^^^^^^^^^^^^^^
7474
|
75-
= note: the only supported types are integers, `bool` and `char`
75+
= note: the only supported types are integers, `bool`, and `char`
7676

7777
error: `String` is forbidden as the type of a const generic parameter
7878
--> $DIR/suggest_feature_only_when_possible.rs:38:19
7979
|
8080
LL | fn nya_0<const N: String>() {}
8181
| ^^^^^^
8282
|
83-
= note: the only supported types are integers, `bool` and `char`
83+
= note: the only supported types are integers, `bool`, and `char`
8484

8585
error: `Vec<u32>` is forbidden as the type of a const generic parameter
8686
--> $DIR/suggest_feature_only_when_possible.rs:40:19
8787
|
8888
LL | fn nya_1<const N: Vec<u32>>() {}
8989
| ^^^^^^^^
9090
|
91-
= note: the only supported types are integers, `bool` and `char`
91+
= note: the only supported types are integers, `bool`, and `char`
9292

9393
error: aborting due to 9 previous errors
9494

Diff for: ‎tests/ui/const-generics/const-param-elided-lifetime.full.stderr

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,25 @@ LL | struct A<const N: &u8>;
55
| ^ explicit lifetime name needed here
66

77
error[E0637]: `&` without an explicit lifetime name cannot be used here
8-
--> $DIR/const-param-elided-lifetime.rs:14:15
8+
--> $DIR/const-param-elided-lifetime.rs:13:15
99
|
1010
LL | impl<const N: &u8> A<N> {
1111
| ^ explicit lifetime name needed here
1212

1313
error[E0637]: `&` without an explicit lifetime name cannot be used here
14-
--> $DIR/const-param-elided-lifetime.rs:17:21
14+
--> $DIR/const-param-elided-lifetime.rs:15:21
1515
|
1616
LL | fn foo<const M: &u8>(&self) {}
1717
| ^ explicit lifetime name needed here
1818

1919
error[E0637]: `&` without an explicit lifetime name cannot be used here
20-
--> $DIR/const-param-elided-lifetime.rs:22:15
20+
--> $DIR/const-param-elided-lifetime.rs:19:15
2121
|
2222
LL | impl<const N: &u8> B for A<N> {}
2323
| ^ explicit lifetime name needed here
2424

2525
error[E0637]: `&` without an explicit lifetime name cannot be used here
26-
--> $DIR/const-param-elided-lifetime.rs:26:17
26+
--> $DIR/const-param-elided-lifetime.rs:22:17
2727
|
2828
LL | fn bar<const N: &u8>() {}
2929
| ^ explicit lifetime name needed here

Diff for: ‎tests/ui/const-generics/const-param-elided-lifetime.min.stderr

+5-85
Original file line numberDiff line numberDiff line change
@@ -5,109 +5,29 @@ LL | struct A<const N: &u8>;
55
| ^ explicit lifetime name needed here
66

77
error[E0637]: `&` without an explicit lifetime name cannot be used here
8-
--> $DIR/const-param-elided-lifetime.rs:14:15
8+
--> $DIR/const-param-elided-lifetime.rs:13:15
99
|
1010
LL | impl<const N: &u8> A<N> {
1111
| ^ explicit lifetime name needed here
1212

1313
error[E0637]: `&` without an explicit lifetime name cannot be used here
14-
--> $DIR/const-param-elided-lifetime.rs:17:21
14+
--> $DIR/const-param-elided-lifetime.rs:15:21
1515
|
1616
LL | fn foo<const M: &u8>(&self) {}
1717
| ^ explicit lifetime name needed here
1818

1919
error[E0637]: `&` without an explicit lifetime name cannot be used here
20-
--> $DIR/const-param-elided-lifetime.rs:22:15
20+
--> $DIR/const-param-elided-lifetime.rs:19:15
2121
|
2222
LL | impl<const N: &u8> B for A<N> {}
2323
| ^ explicit lifetime name needed here
2424

2525
error[E0637]: `&` without an explicit lifetime name cannot be used here
26-
--> $DIR/const-param-elided-lifetime.rs:26:17
26+
--> $DIR/const-param-elided-lifetime.rs:22:17
2727
|
2828
LL | fn bar<const N: &u8>() {}
2929
| ^ explicit lifetime name needed here
3030

31-
error: `&u8` is forbidden as the type of a const generic parameter
32-
--> $DIR/const-param-elided-lifetime.rs:9:19
33-
|
34-
LL | struct A<const N: &u8>;
35-
| ^^^
36-
|
37-
= note: the only supported types are integers, `bool` and `char`
38-
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
39-
|
40-
LL + #![feature(adt_const_params)]
41-
|
42-
help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
43-
|
44-
LL + #![feature(unsized_const_params)]
45-
|
46-
47-
error: `&u8` is forbidden as the type of a const generic parameter
48-
--> $DIR/const-param-elided-lifetime.rs:14:15
49-
|
50-
LL | impl<const N: &u8> A<N> {
51-
| ^^^
52-
|
53-
= note: the only supported types are integers, `bool` and `char`
54-
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
55-
|
56-
LL + #![feature(adt_const_params)]
57-
|
58-
help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
59-
|
60-
LL + #![feature(unsized_const_params)]
61-
|
62-
63-
error: `&u8` is forbidden as the type of a const generic parameter
64-
--> $DIR/const-param-elided-lifetime.rs:22:15
65-
|
66-
LL | impl<const N: &u8> B for A<N> {}
67-
| ^^^
68-
|
69-
= note: the only supported types are integers, `bool` and `char`
70-
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
71-
|
72-
LL + #![feature(adt_const_params)]
73-
|
74-
help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
75-
|
76-
LL + #![feature(unsized_const_params)]
77-
|
78-
79-
error: `&u8` is forbidden as the type of a const generic parameter
80-
--> $DIR/const-param-elided-lifetime.rs:26:17
81-
|
82-
LL | fn bar<const N: &u8>() {}
83-
| ^^^
84-
|
85-
= note: the only supported types are integers, `bool` and `char`
86-
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
87-
|
88-
LL + #![feature(adt_const_params)]
89-
|
90-
help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
91-
|
92-
LL + #![feature(unsized_const_params)]
93-
|
94-
95-
error: `&u8` is forbidden as the type of a const generic parameter
96-
--> $DIR/const-param-elided-lifetime.rs:17:21
97-
|
98-
LL | fn foo<const M: &u8>(&self) {}
99-
| ^^^
100-
|
101-
= note: the only supported types are integers, `bool` and `char`
102-
help: add `#![feature(adt_const_params)]` to the crate attributes to enable more complex and user defined types
103-
|
104-
LL + #![feature(adt_const_params)]
105-
|
106-
help: add `#![feature(unsized_const_params)]` to the crate attributes to enable references to implement the `ConstParamTy` trait
107-
|
108-
LL + #![feature(unsized_const_params)]
109-
|
110-
111-
error: aborting due to 10 previous errors
31+
error: aborting due to 5 previous errors
11232

11333
For more information about this error, try `rustc --explain E0637`.

0 commit comments

Comments
 (0)