languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-10-14 04:23:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #45442 - matthewjasper:const-dynamic-capture-error, r=petrochenkov

Browse source 
Cleanly error for non-const variable in associated const

Not sure if wrapping the whole `visit::walk_impl_item` call is correct.
Closes #44239
This commit is contained in:
bors 2017-10-22 15:17:08 +00:00
parent 942f31f5ea 02635c2d37
commit fc1a03d7d0
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/librustc_resolve/lib.rs
View file

@ -2084,7 +2084,9 @@ fn resolve_implementation(&mut self,
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

19
src/test/compile-fail/issue-44239.rs Normal file
View file

@ -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
}
}