Skip to content

Commit f2fe71c

Browse files
varkorvarkor
committed
Resolve incorrect diagnostic for using a non-const value in a constant
1 parent 1b933a5 commit f2fe71c

13 files changed

+47
-57
lines changed

Diff for: ‎src/librustc_resolve/lib.rs

+13-5
Original file line numberDiff line numberDiff line change
@@ -4164,6 +4164,9 @@ impl<'a> Resolver<'a> {
41644164
span_bug!(span, "unexpected {:?} in bindings", def)
41654165
}
41664166
Def::Local(node_id) => {
4167+
use ResolutionError::*;
4168+
let mut res_err = None;
4169+
41674170
for rib in ribs {
41684171
match rib.kind {
41694172
NormalRibKind | ModuleRibKind(..) | MacroDefinition(..) |
@@ -4199,21 +4202,26 @@ impl<'a> Resolver<'a> {
41994202
// named function item. This is not allowed, so we
42004203
// report an error.
42014204
if record_used {
4202-
resolve_error(self, span,
4203-
ResolutionError::CannotCaptureDynamicEnvironmentInFnItem);
4205+
// We don't immediately trigger a resolve error, because
4206+
// we want certain other resolution errors (namely those
4207+
// emitted for `ConstantItemRibKind` below) to take
4208+
// precedence.
4209+
res_err = Some(CannotCaptureDynamicEnvironmentInFnItem);
42044210
}
4205-
return Def::Err;
42064211
}
42074212
ConstantItemRibKind => {
42084213
// Still doesn't deal with upvars
42094214
if record_used {
4210-
resolve_error(self, span,
4211-
ResolutionError::AttemptToUseNonConstantValueInConstant);
4215+
resolve_error(self, span, AttemptToUseNonConstantValueInConstant);
42124216
}
42134217
return Def::Err;
42144218
}
42154219
}
42164220
}
4221+
if let Some(res_err) = res_err {
4222+
resolve_error(self, span, res_err);
4223+
return Def::Err;
4224+
}
42174225
}
42184226
Def::TyParam(..) | Def::SelfTy(..) => {
42194227
for rib in ribs {

Diff for: ‎src/test/ui/impl-trait/bindings.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22

33
fn a<T: Clone>(x: T) {
44
const foo: impl Clone = x;
5-
//~^ ERROR can't capture dynamic environment in a fn item
5+
//~^ ERROR attempt to use a non-constant value in a constant
66
}
77

88
fn b<T: Clone>(x: T) {
99
let _ = move || {
1010
const foo: impl Clone = x;
11-
//~^ ERROR can't capture dynamic environment in a fn item
11+
//~^ ERROR attempt to use a non-constant value in a constant
1212
};
1313
}
1414

1515
trait Foo<T: Clone> {
1616
fn a(x: T) {
1717
const foo: impl Clone = x;
18-
//~^ ERROR can't capture dynamic environment in a fn item
18+
//~^ ERROR attempt to use a non-constant value in a constant
1919
}
2020
}
2121

2222
impl<T: Clone> Foo<T> for i32 {
2323
fn a(x: T) {
2424
const foo: impl Clone = x;
25-
//~^ ERROR can't capture dynamic environment in a fn item
25+
//~^ ERROR attempt to use a non-constant value in a constant
2626
}
2727
}
2828

Diff for: ‎src/test/ui/impl-trait/bindings.stderr

+9-17
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,27 @@
1-
error[E0434]: can't capture dynamic environment in a fn item
1+
error[E0435]: attempt to use a non-constant value in a constant
22
--> $DIR/bindings.rs:4:29
33
|
44
LL | const foo: impl Clone = x;
5-
| ^
6-
|
7-
= help: use the `|| { ... }` closure form instead
5+
| ^ non-constant value
86

9-
error[E0434]: can't capture dynamic environment in a fn item
7+
error[E0435]: attempt to use a non-constant value in a constant
108
--> $DIR/bindings.rs:10:33
119
|
1210
LL | const foo: impl Clone = x;
13-
| ^
14-
|
15-
= help: use the `|| { ... }` closure form instead
11+
| ^ non-constant value
1612

17-
error[E0434]: can't capture dynamic environment in a fn item
13+
error[E0435]: attempt to use a non-constant value in a constant
1814
--> $DIR/bindings.rs:17:33
1915
|
2016
LL | const foo: impl Clone = x;
21-
| ^
22-
|
23-
= help: use the `|| { ... }` closure form instead
17+
| ^ non-constant value
2418

25-
error[E0434]: can't capture dynamic environment in a fn item
19+
error[E0435]: attempt to use a non-constant value in a constant
2620
--> $DIR/bindings.rs:24:33
2721
|
2822
LL | const foo: impl Clone = x;
29-
| ^
30-
|
31-
= help: use the `|| { ... }` closure form instead
23+
| ^ non-constant value
3224

3325
error: aborting due to 4 previous errors
3426

35-
For more information about this error, try `rustc --explain E0434`.
27+
For more information about this error, try `rustc --explain E0435`.

Diff for: ‎src/test/ui/issues/issue-27433.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fn main() {
22
let foo = 42u32;
33
const FOO : u32 = foo;
4-
//~^ ERROR can't capture dynamic environment
4+
//~^ ERROR attempt to use a non-constant value in a constant
55
}

Diff for: ‎src/test/ui/issues/issue-27433.stderr

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
error[E0434]: can't capture dynamic environment in a fn item
1+
error[E0435]: attempt to use a non-constant value in a constant
22
--> $DIR/issue-27433.rs:3:23
33
|
44
LL | const FOO : u32 = foo;
5-
| ^^^
6-
|
7-
= help: use the `|| { ... }` closure form instead
5+
| ^^^ non-constant value
86

97
error: aborting due to previous error
108

11-
For more information about this error, try `rustc --explain E0434`.
9+
For more information about this error, try `rustc --explain E0435`.

Diff for: ‎src/test/ui/issues/issue-3521-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ fn main() {
22
let foo = 100;
33

44
static y: isize = foo + 1;
5-
//~^ ERROR can't capture dynamic environment
5+
//~^ ERROR attempt to use a non-constant value in a constant
66

77
println!("{}", y);
88
}

Diff for: ‎src/test/ui/issues/issue-3521-2.stderr

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
error[E0434]: can't capture dynamic environment in a fn item
1+
error[E0435]: attempt to use a non-constant value in a constant
22
--> $DIR/issue-3521-2.rs:4:23
33
|
44
LL | static y: isize = foo + 1;
5-
| ^^^
6-
|
7-
= help: use the `|| { ... }` closure form instead
5+
| ^^^ non-constant value
86

97
error: aborting due to previous error
108

11-
For more information about this error, try `rustc --explain E0434`.
9+
For more information about this error, try `rustc --explain E0435`.

Diff for: ‎src/test/ui/issues/issue-3668-2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fn f(x:isize) {
22
static child: isize = x + 1;
3-
//~^ ERROR can't capture dynamic environment
3+
//~^ ERROR attempt to use a non-constant value in a constant
44
}
55

66
fn main() {}

Diff for: ‎src/test/ui/issues/issue-3668-2.stderr

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
error[E0434]: can't capture dynamic environment in a fn item
1+
error[E0435]: attempt to use a non-constant value in a constant
22
--> $DIR/issue-3668-2.rs:2:27
33
|
44
LL | static child: isize = x + 1;
5-
| ^
6-
|
7-
= help: use the `|| { ... }` closure form instead
5+
| ^ non-constant value
86

97
error: aborting due to previous error
108

11-
For more information about this error, try `rustc --explain E0434`.
9+
For more information about this error, try `rustc --explain E0435`.

Diff for: ‎src/test/ui/issues/issue-3668.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trait PTrait {
66
impl PTrait for P {
77
fn getChildOption(&self) -> Option<Box<P>> {
88
static childVal: Box<P> = self.child.get();
9-
//~^ ERROR can't capture dynamic environment
9+
//~^ ERROR attempt to use a non-constant value in a constant
1010
panic!();
1111
}
1212
}

Diff for: ‎src/test/ui/issues/issue-3668.stderr

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
error[E0434]: can't capture dynamic environment in a fn item
1+
error[E0435]: attempt to use a non-constant value in a constant
22
--> $DIR/issue-3668.rs:8:34
33
|
44
LL | static childVal: Box<P> = self.child.get();
5-
| ^^^^
6-
|
7-
= help: use the `|| { ... }` closure form instead
5+
| ^^^^ non-constant value
86

97
error: aborting due to previous error
108

11-
For more information about this error, try `rustc --explain E0434`.
9+
For more information about this error, try `rustc --explain E0435`.

Diff for: ‎src/test/ui/type/type-dependent-def-issue-49241.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
fn main() {
22
let v = vec![0];
3-
const l: usize = v.count(); //~ ERROR can't capture dynamic environment in a fn item
3+
const l: usize = v.count(); //~ ERROR attempt to use a non-constant value in a constant
44
let s: [u32; l] = v.into_iter().collect();
55
//~^ ERROR evaluation of constant value failed
66
}

Diff for: ‎src/test/ui/type/type-dependent-def-issue-49241.stderr

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
error[E0434]: can't capture dynamic environment in a fn item
1+
error[E0435]: attempt to use a non-constant value in a constant
22
--> $DIR/type-dependent-def-issue-49241.rs:3:22
33
|
4-
LL | const l: usize = v.count(); //~ ERROR can't capture dynamic environment in a fn item
5-
| ^
6-
|
7-
= help: use the `|| { ... }` closure form instead
4+
LL | const l: usize = v.count(); //~ ERROR attempt to use a non-constant value in a constant
5+
| ^ non-constant value
86

97
error[E0080]: evaluation of constant value failed
108
--> $DIR/type-dependent-def-issue-49241.rs:4:18
@@ -14,5 +12,5 @@ LL | let s: [u32; l] = v.into_iter().collect();
1412

1513
error: aborting due to 2 previous errors
1614

17-
Some errors occurred: E0080, E0434.
15+
Some errors occurred: E0080, E0435.
1816
For more information about an error, try `rustc --explain E0080`.

0 commit comments

Comments
 (0)