From 63ecd6aa0f2c8a6807528d8bdf5eb30211b3fcd4 Mon Sep 17 00:00:00 2001 From: Masaki Hara Date: Tue, 9 May 2017 22:32:29 +0900 Subject: [PATCH 1/4] Prohibit parenthesized params in more types. --- src/librustc_typeck/astconv.rs | 18 ++++++++++++++---- src/test/compile-fail/issue-32995.rs | 25 +++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 src/test/compile-fail/issue-32995.rs diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index adcb3d682ca..93411493b17 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -161,10 +161,7 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o { match item_segment.parameters { hir::AngleBracketedParameters(_) => {} hir::ParenthesizedParameters(..) => { - struct_span_err!(tcx.sess, span, E0214, - "parenthesized parameters may only be used with a trait") - .span_label(span, "only traits may use parentheses") - .emit(); + self.prohibit_parenthesized_params(item_segment); return Substs::for_item(tcx, def_id, |_, _| { tcx.types.re_static @@ -948,6 +945,10 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o { pub fn prohibit_type_params(&self, segments: &[hir::PathSegment]) { for segment in segments { + if let hir::ParenthesizedParameters(_) = segment.parameters { + self.prohibit_parenthesized_params(segment); + break; + } for typ in segment.parameters.types() { struct_span_err!(self.tcx().sess, typ.span, E0109, "type parameters are not allowed on this type") @@ -970,6 +971,15 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o { } } + pub fn prohibit_parenthesized_params(&self, segment: &hir::PathSegment) { + if let hir::ParenthesizedParameters(ref data) = segment.parameters { + struct_span_err!(self.tcx().sess, data.span, E0214, + "parenthesized parameters may only be used with a trait") + .span_label(data.span, "only traits may use parentheses") + .emit(); + } + } + pub fn prohibit_projection(&self, span: Span) { let mut err = struct_span_err!(self.tcx().sess, span, E0229, "associated type bindings are not allowed here"); diff --git a/src/test/compile-fail/issue-32995.rs b/src/test/compile-fail/issue-32995.rs new file mode 100644 index 00000000000..2fb22e68beb --- /dev/null +++ b/src/test/compile-fail/issue-32995.rs @@ -0,0 +1,25 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +fn main() { + let s: String() = String::from("foo"); + //~^ ERROR parenthesized parameters may only be used with a trait + + let x: usize() = 1; + //~^ ERROR parenthesized parameters may only be used with a trait + + let b: ::std::boxed()::Box<_> = Box::new(1); + //~^ ERROR parenthesized parameters may only be used with a trait +} + +fn foo() { + let d : X() = Default::default(); + //~^ ERROR parenthesized parameters may only be used with a trait +} From 2a20073c9430ff433b7863bc9ffc1b36177d2ab4 Mon Sep 17 00:00:00 2001 From: Masaki Hara Date: Mon, 15 May 2017 15:21:01 +0900 Subject: [PATCH 2/4] Prohibit parenthesized params in bounds etc. --- src/librustc_typeck/astconv.rs | 11 +++++++++++ src/librustc_typeck/check/mod.rs | 3 ++- src/test/compile-fail/issue-32995-2.rs | 25 +++++++++++++++++++++++++ src/test/compile-fail/issue-32995.rs | 16 ++++++++++++++++ 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 src/test/compile-fail/issue-32995-2.rs diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index 93411493b17..d8a3ebe063a 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -372,6 +372,8 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o { self_ty: Ty<'tcx>) -> ty::TraitRef<'tcx> { + self.prohibit_type_params(trait_ref.path.segments.split_last().unwrap().1); + let trait_def_id = self.trait_def_id(trait_ref); self.ast_path_to_mono_trait_ref(trait_ref.path.span, trait_def_id, @@ -404,6 +406,8 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o { debug!("ast_path_to_poly_trait_ref({:?}, def_id={:?})", trait_ref, trait_def_id); + self.prohibit_type_params(trait_ref.path.segments.split_last().unwrap().1); + let (substs, assoc_bindings) = self.create_substs_for_ast_trait_ref(trait_ref.path.span, trait_def_id, @@ -625,6 +629,13 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o { dummy_self, &mut projection_bounds); + for trait_bound in trait_bounds[1..].iter() { + // Sanity check for non-principal trait bounds + self.instantiate_poly_trait_ref(trait_bound, + dummy_self, + &mut vec![]); + } + let (auto_traits, trait_bounds) = split_auto_traits(tcx, &trait_bounds[1..]); if !trait_bounds.is_empty() { diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index 127ffc60cf4..05594cff8a0 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -4495,7 +4495,8 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { (&data.lifetimes[..], &data.types[..], data.infer_types, &data.bindings[..]) } Some(&hir::ParenthesizedParameters(_)) => { - span_bug!(span, "parenthesized parameters cannot appear in ExprPath"); + AstConv::prohibit_parenthesized_params(self, &segment.as_ref().unwrap().0); + (&[][..], &[][..], true, &[][..]) } None => (&[][..], &[][..], true, &[][..]) } diff --git a/src/test/compile-fail/issue-32995-2.rs b/src/test/compile-fail/issue-32995-2.rs new file mode 100644 index 00000000000..80113d3b4ec --- /dev/null +++ b/src/test/compile-fail/issue-32995-2.rs @@ -0,0 +1,25 @@ +// 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 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(conservative_impl_trait)] + +fn main() { + { fn f() {} } + //~^ ERROR parenthesized parameters may only be used with a trait + + { fn f() -> impl ::std::marker()::Send { } } + //~^ ERROR parenthesized parameters may only be used with a trait +} + +#[derive(Clone)] +struct X; + +impl ::std::marker()::Copy for X {} +//~^ ERROR parenthesized parameters may only be used with a trait diff --git a/src/test/compile-fail/issue-32995.rs b/src/test/compile-fail/issue-32995.rs index 2fb22e68beb..d38bec45513 100644 --- a/src/test/compile-fail/issue-32995.rs +++ b/src/test/compile-fail/issue-32995.rs @@ -17,6 +17,22 @@ fn main() { let b: ::std::boxed()::Box<_> = Box::new(1); //~^ ERROR parenthesized parameters may only be used with a trait + + macro_rules! pathexpr { + ($p:path) => { $p } + } + + let p = pathexpr!(::std::str()::from_utf8)(b"foo").unwrap(); + //~^ ERROR parenthesized parameters may only be used with a trait + + let p = pathexpr!(::std::str::from_utf8())(b"foo").unwrap(); + //~^ ERROR parenthesized parameters may only be used with a trait + + let o : Box<::std::marker()::Send> = Box::new(1); + //~^ ERROR parenthesized parameters may only be used with a trait + + let o : Box = Box::new(1); + //~^ ERROR parenthesized parameters may only be used with a trait } fn foo() { From e8137d7ceadfa25b06e35e358870bb2687b0443d Mon Sep 17 00:00:00 2001 From: Masaki Hara Date: Tue, 16 May 2017 10:32:04 +0900 Subject: [PATCH 3/4] Fix a test to recognize newly introduced errors. --- src/test/compile-fail/issue-22560.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/test/compile-fail/issue-22560.rs b/src/test/compile-fail/issue-22560.rs index 2ad804fc8ce..eb5c6076440 100644 --- a/src/test/compile-fail/issue-22560.rs +++ b/src/test/compile-fail/issue-22560.rs @@ -19,7 +19,10 @@ type Test = Add + //~| ERROR E0191 //~| NOTE missing associated type `Output` value Sub; - //~^ ERROR E0225 + //~^ ERROR E0393 + //~| NOTE missing reference to `RHS` + //~| NOTE because of the default `Self` reference, type parameters must be specified on object types + //~| ERROR E0225 //~| NOTE non-Send/Sync additional trait fn main() { } From 99993780dc2db803877ed700cbf315246fc3ad7f Mon Sep 17 00:00:00 2001 From: Masaki Hara Date: Fri, 26 May 2017 22:20:53 +0900 Subject: [PATCH 4/4] Add warning cycle #42238. --- src/librustc/lint/builtin.rs | 7 +++++++ src/librustc_lint/lib.rs | 4 ++++ src/librustc_typeck/astconv.rs | 21 +++++++++++++------- src/librustc_typeck/check/mod.rs | 3 ++- src/test/compile-fail/issue-32995-2.rs | 11 +++++++++++ src/test/compile-fail/issue-32995.rs | 27 +++++++++++++++++++++++--- 6 files changed, 62 insertions(+), 11 deletions(-) diff --git a/src/librustc/lint/builtin.rs b/src/librustc/lint/builtin.rs index e681d55cf94..f08c37b773a 100644 --- a/src/librustc/lint/builtin.rs +++ b/src/librustc/lint/builtin.rs @@ -236,6 +236,12 @@ declare_lint! { "detects missing fragment specifiers in unused `macro_rules!` patterns" } +declare_lint! { + pub PARENTHESIZED_PARAMS_IN_TYPES_AND_MODULES, + Warn, + "detects parenthesized generic parameters in type and module names" +} + declare_lint! { pub DEPRECATED, Warn, @@ -286,6 +292,7 @@ impl LintPass for HardwiredLints { LEGACY_IMPORTS, LEGACY_CONSTRUCTOR_VISIBILITY, MISSING_FRAGMENT_SPECIFIER, + PARENTHESIZED_PARAMS_IN_TYPES_AND_MODULES, DEPRECATED ) } diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs index 53ea3a8333f..8ff2439b6e9 100644 --- a/src/librustc_lint/lib.rs +++ b/src/librustc_lint/lib.rs @@ -250,6 +250,10 @@ pub fn register_builtins(store: &mut lint::LintStore, sess: Option<&Session>) { id: LintId::of(MISSING_FRAGMENT_SPECIFIER), reference: "issue #40107 ", }, + FutureIncompatibleInfo { + id: LintId::of(PARENTHESIZED_PARAMS_IN_TYPES_AND_MODULES), + reference: "issue #42238 ", + }, FutureIncompatibleInfo { id: LintId::of(ANONYMOUS_PARAMETERS), reference: "issue #41686 ", diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index d8a3ebe063a..7c013e91e5f 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -22,6 +22,7 @@ use rustc::ty::subst::{Kind, Subst, Substs}; use rustc::traits; use rustc::ty::{self, Ty, TyCtxt, ToPredicate, TypeFoldable}; use rustc::ty::wf::object_region_bounds; +use rustc::lint::builtin::PARENTHESIZED_PARAMS_IN_TYPES_AND_MODULES; use rustc_back::slice; use require_c_abi_if_variadic; use util::common::{ErrorReported, FN_OUTPUT_NAME}; @@ -161,7 +162,7 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o { match item_segment.parameters { hir::AngleBracketedParameters(_) => {} hir::ParenthesizedParameters(..) => { - self.prohibit_parenthesized_params(item_segment); + self.prohibit_parenthesized_params(item_segment, true); return Substs::for_item(tcx, def_id, |_, _| { tcx.types.re_static @@ -957,7 +958,7 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o { pub fn prohibit_type_params(&self, segments: &[hir::PathSegment]) { for segment in segments { if let hir::ParenthesizedParameters(_) = segment.parameters { - self.prohibit_parenthesized_params(segment); + self.prohibit_parenthesized_params(segment, false); break; } for typ in segment.parameters.types() { @@ -982,12 +983,18 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o { } } - pub fn prohibit_parenthesized_params(&self, segment: &hir::PathSegment) { + pub fn prohibit_parenthesized_params(&self, segment: &hir::PathSegment, emit_error: bool) { if let hir::ParenthesizedParameters(ref data) = segment.parameters { - struct_span_err!(self.tcx().sess, data.span, E0214, - "parenthesized parameters may only be used with a trait") - .span_label(data.span, "only traits may use parentheses") - .emit(); + if emit_error { + struct_span_err!(self.tcx().sess, data.span, E0214, + "parenthesized parameters may only be used with a trait") + .span_label(data.span, "only traits may use parentheses") + .emit(); + } else { + let msg = "parenthesized parameters may only be used with a trait".to_string(); + self.tcx().sess.add_lint(PARENTHESIZED_PARAMS_IN_TYPES_AND_MODULES, + ast::CRATE_NODE_ID, data.span, msg); + } } } diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index 05594cff8a0..ea4a78eaf29 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/src/librustc_typeck/check/mod.rs @@ -4495,7 +4495,8 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> { (&data.lifetimes[..], &data.types[..], data.infer_types, &data.bindings[..]) } Some(&hir::ParenthesizedParameters(_)) => { - AstConv::prohibit_parenthesized_params(self, &segment.as_ref().unwrap().0); + AstConv::prohibit_parenthesized_params(self, &segment.as_ref().unwrap().0, + false); (&[][..], &[][..], true, &[][..]) } None => (&[][..], &[][..], true, &[][..]) diff --git a/src/test/compile-fail/issue-32995-2.rs b/src/test/compile-fail/issue-32995-2.rs index 80113d3b4ec..cb68d52ef96 100644 --- a/src/test/compile-fail/issue-32995-2.rs +++ b/src/test/compile-fail/issue-32995-2.rs @@ -8,14 +8,23 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#![deny(parenthesized_params_in_types_and_modules)] +//~^ NOTE lint level defined here +//~| NOTE lint level defined here +//~| NOTE lint level defined here +#![allow(dead_code, unused_variables)] #![feature(conservative_impl_trait)] fn main() { { fn f() {} } //~^ ERROR parenthesized parameters may only be used with a trait + //~| WARN previously accepted + //~| NOTE issue #42238 { fn f() -> impl ::std::marker()::Send { } } //~^ ERROR parenthesized parameters may only be used with a trait + //~| WARN previously accepted + //~| NOTE issue #42238 } #[derive(Clone)] @@ -23,3 +32,5 @@ struct X; impl ::std::marker()::Copy for X {} //~^ ERROR parenthesized parameters may only be used with a trait +//~| WARN previously accepted +//~| NOTE issue #42238 diff --git a/src/test/compile-fail/issue-32995.rs b/src/test/compile-fail/issue-32995.rs index d38bec45513..f2ed8bf53ea 100644 --- a/src/test/compile-fail/issue-32995.rs +++ b/src/test/compile-fail/issue-32995.rs @@ -8,15 +8,26 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -fn main() { - let s: String() = String::from("foo"); - //~^ ERROR parenthesized parameters may only be used with a trait +#![deny(parenthesized_params_in_types_and_modules)] +//~^ NOTE lint level defined here +//~| NOTE lint level defined here +//~| NOTE lint level defined here +//~| NOTE lint level defined here +//~| NOTE lint level defined here +//~| NOTE lint level defined here +//~| NOTE lint level defined here +#![allow(dead_code, unused_variables)] +fn main() { let x: usize() = 1; //~^ ERROR parenthesized parameters may only be used with a trait + //~| WARN previously accepted + //~| NOTE issue #42238 let b: ::std::boxed()::Box<_> = Box::new(1); //~^ ERROR parenthesized parameters may only be used with a trait + //~| WARN previously accepted + //~| NOTE issue #42238 macro_rules! pathexpr { ($p:path) => { $p } @@ -24,18 +35,28 @@ fn main() { let p = pathexpr!(::std::str()::from_utf8)(b"foo").unwrap(); //~^ ERROR parenthesized parameters may only be used with a trait + //~| WARN previously accepted + //~| NOTE issue #42238 let p = pathexpr!(::std::str::from_utf8())(b"foo").unwrap(); //~^ ERROR parenthesized parameters may only be used with a trait + //~| WARN previously accepted + //~| NOTE issue #42238 let o : Box<::std::marker()::Send> = Box::new(1); //~^ ERROR parenthesized parameters may only be used with a trait + //~| WARN previously accepted + //~| NOTE issue #42238 let o : Box = Box::new(1); //~^ ERROR parenthesized parameters may only be used with a trait + //~| WARN previously accepted + //~| NOTE issue #42238 } fn foo() { let d : X() = Default::default(); //~^ ERROR parenthesized parameters may only be used with a trait + //~| WARN previously accepted + //~| NOTE issue #42238 }