From 4734b4a6ac8c2f67945fce10e8b30ad47f7581ae Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Thu, 12 Jan 2017 16:04:33 -0500 Subject: [PATCH 1/4] only consider value items when searching for methods, not types --- src/librustc_typeck/check/method/probe.rs | 11 +++++++++-- src/test/compile-fail/issue-38919.rs | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 src/test/compile-fail/issue-38919.rs diff --git a/src/librustc_typeck/check/method/probe.rs b/src/librustc_typeck/check/method/probe.rs index 5cb0804b1bca1..0f28be90abfbe 100644 --- a/src/librustc_typeck/check/method/probe.rs +++ b/src/librustc_typeck/check/method/probe.rs @@ -1140,10 +1140,17 @@ impl<'a, 'gcx, 'tcx> ProbeContext<'a, 'gcx, 'tcx> { /////////////////////////////////////////////////////////////////////////// // MISCELLANY fn has_applicable_self(&self, item: &ty::AssociatedItem) -> bool { - // "fast track" -- check for usage of sugar + // "Fast track" -- check for usage of sugar when in method call + // mode. + // + // In Path mode (i.e., resolving a value like `T::next`), consider any + // associated value (i.e., methods, constants) but not types. match self.mode { Mode::MethodCall => item.method_has_self_argument, - Mode::Path => true + Mode::Path => match item.kind { + ty::AssociatedKind::Type => false, + ty::AssociatedKind::Method | ty::AssociatedKind::Const => true + }, } // FIXME -- check for types that deref to `Self`, // like `Rc` and so on. diff --git a/src/test/compile-fail/issue-38919.rs b/src/test/compile-fail/issue-38919.rs new file mode 100644 index 0000000000000..d907740ed0186 --- /dev/null +++ b/src/test/compile-fail/issue-38919.rs @@ -0,0 +1,15 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +fn foo() { + T::Item; //~ ERROR no associated item named `Item` found for type `T` +} + +fn main() { } From 2a833e4dcb9625daf22e8cabb093c4ec1d7e4f4e Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Tue, 17 Jan 2017 17:55:49 -0500 Subject: [PATCH 2/4] more complete error message --- src/test/compile-fail/issue-38919.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/compile-fail/issue-38919.rs b/src/test/compile-fail/issue-38919.rs index d907740ed0186..e6cee4afd59fe 100644 --- a/src/test/compile-fail/issue-38919.rs +++ b/src/test/compile-fail/issue-38919.rs @@ -9,7 +9,7 @@ // except according to those terms. fn foo() { - T::Item; //~ ERROR no associated item named `Item` found for type `T` + T::Item; //~ ERROR no associated item named `Item` found for type `T` in the current scope } fn main() { } From 7f31a271b10fdccdb79231af1450f67d40caacab Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Tue, 17 Jan 2017 17:56:03 -0500 Subject: [PATCH 3/4] tolerate `None` return from `get_line` --- src/libsyntax/json.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsyntax/json.rs b/src/libsyntax/json.rs index a1c273baeea42..adab76309fe38 100644 --- a/src/libsyntax/json.rs +++ b/src/libsyntax/json.rs @@ -296,7 +296,7 @@ impl DiagnosticSpanLine { h_end: usize) -> DiagnosticSpanLine { DiagnosticSpanLine { - text: fm.get_line(index).unwrap().to_owned(), + text: fm.get_line(index).unwrap_or("").to_owned(), highlight_start: h_start, highlight_end: h_end, } From 27ceb8c685c4bfcfbfde84e0cc0a99fd6851e0f2 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Thu, 19 Jan 2017 01:55:20 +0000 Subject: [PATCH 4/4] Bump prerelease version --- mk/main.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/main.mk b/mk/main.mk index 3ac693ed204cf..fe333dae08ac7 100644 --- a/mk/main.mk +++ b/mk/main.mk @@ -18,7 +18,7 @@ CFG_RELEASE_NUM=1.15.0 # An optional number to put after the label, e.g. '.2' -> '-beta.2' # NB Make sure it starts with a dot to conform to semver pre-release # versions (section 9) -CFG_PRERELEASE_VERSION=.3 +CFG_PRERELEASE_VERSION=.4 ifeq ($(CFG_RELEASE_CHANNEL),stable) # This is the normal semver version string, e.g. "0.12.0", "0.12.0-nightly"