Skip to content

Commit 0490f49

Browse files
committed
---
yaml --- r: 273019 b: refs/heads/beta c: 1a6092e h: refs/heads/master i: 273017: 129d17a 273015: bd53440
1 parent 961827a commit 0490f49

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: e2171bff7508a76b6c34b2bd9214c19808a3cbaf
26+
refs/heads/beta: 1a6092e05cecdaef984b2b0174089e6ae8c24181
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_resolve/resolve_imports.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -586,6 +586,10 @@ impl<'a, 'b:'a, 'tcx:'b> ImportResolver<'a, 'b, 'tcx> {
586586
target_module: Module<'b>,
587587
directive: &'b ImportDirective)
588588
-> ResolveResult<()> {
589+
if let Some(Def::Trait(_)) = target_module.def {
590+
self.resolver.session.span_err(directive.span, "items in traits are not importable.");
591+
}
592+
589593
if module_.def_id() == target_module.def_id() {
590594
// This means we are trying to glob import a module into itself, and it is a no-go
591595
let msg = "Cannot glob-import a module into itself.".into();

branches/beta/src/test/compile-fail/issue-30560.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@ type Alias = ();
1212
use Alias::*; //~ ERROR Not a module
1313
use std::io::Result::*; //~ ERROR Not a module
1414

15+
trait T {}
16+
use T::*; //~ ERROR items in traits are not importable
17+
1518
fn main() {}

0 commit comments

Comments
 (0)