about summary refs log tree commit diff
path: root/src/test/compile-fail
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-07-14 14:33:17 -0700
committerGitHub <noreply@github.com>2016-07-14 14:33:17 -0700
commite08a6c2068aad3539cf0fa58e097962e3a3cf0b5 (patch)
tree1f30733ee9c15f00428faa79f64acb2c9dab6a1e /src/test/compile-fail
parent78d49bfac2bbcd48de522199212a1209f498e834 (diff)
parent5a99d798577a1e5a3e5434bad4b68835b708f6c0 (diff)
downloadrust-e08a6c2068aad3539cf0fa58e097962e3a3cf0b5.tar.gz
rust-e08a6c2068aad3539cf0fa58e097962e3a3cf0b5.zip
Auto merge of #34797 - doomrobo:fix-import-trait-method, r=jseyfried
Fixed issue where importing a trait method directly and then calling the method causes a compiler panic

The code below triggers the panic, and is included in a new regression test.

```rust
trait Foo {
    fn foo();
}

use Foo::foo;

fn main() {
    foo();
}
```
The bug is caused by `librustc_resolve` allowing the illegal binding to be imported even after displaying the error message above.

The fix amounts to importing a dummy binding (`rustc::hir::def::Def::Err`) instead of the actual trait method.
Diffstat (limited to 'src/test/compile-fail')
-rw-r--r--src/test/compile-fail/import-trait-method.rs17
1 files changed, 17 insertions, 0 deletions
diff --git a/src/test/compile-fail/import-trait-method.rs b/src/test/compile-fail/import-trait-method.rs
new file mode 100644
index 00000000000..75081b10d86
--- /dev/null
+++ b/src/test/compile-fail/import-trait-method.rs
@@ -0,0 +1,17 @@
+// Copyright 2016 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.
+
+trait Foo {
+    fn foo();
+}
+
+use Foo::foo; //~ ERROR not directly importable
+
+fn main() { foo(); }