Skip to content

Commit

Permalink
Auto merge of #45442 - matthewjasper:const-dynamic-capture-error, r=p…
Browse files Browse the repository at this point in the history
…etrochenkov

Cleanly error for non-const variable in associated const

Not sure if wrapping the whole `visit::walk_impl_item` call is correct.
Closes #44239
  • Loading branch information
bors committed Oct 22, 2017
2 parents 942f31f + 02635c2 commit fc1a03d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/librustc_resolve/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2084,7 +2084,9 @@ impl<'a> Resolver<'a> {
ValueNS,
impl_item.span,
|n, s| ResolutionError::ConstNotMemberOfTrait(n, s));
visit::walk_impl_item(this, impl_item);
this.with_constant_rib(|this|
visit::walk_impl_item(this, impl_item)
);
}
ImplItemKind::Method(ref sig, _) => {
// If this is a trait impl, ensure the method
Expand Down
19 changes: 19 additions & 0 deletions src/test/compile-fail/issue-44239.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

fn main() {
let n = 0;

struct Foo;
impl Foo {
const N: usize = n;
//~^ ERROR attempt to use a non-constant value
}
}

0 comments on commit fc1a03d

Please sign in to comment.