From owner-svn-ports-all@freebsd.org Sat Dec 29 03:24:52 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0A323142F936; Sat, 29 Dec 2018 03:24:52 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A1D5F82DC0; Sat, 29 Dec 2018 03:24:51 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98C964FEC; Sat, 29 Dec 2018 03:24:51 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBT3OpZa099698; Sat, 29 Dec 2018 03:24:51 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBT3OpeR099697; Sat, 29 Dec 2018 03:24:51 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201812290324.wBT3OpeR099697@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 29 Dec 2018 03:24:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r488649 - head/lang/rust-nightly/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/lang/rust-nightly/files X-SVN-Commit-Revision: 488649 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A1D5F82DC0 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.97)[-0.971,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.998,0] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 29 Dec 2018 03:24:52 -0000 Author: jbeich Date: Sat Dec 29 03:24:51 2018 New Revision: 488649 URL: https://svnweb.freebsd.org/changeset/ports/488649 Log: lang/rust-nightly: unbreak after r488641 error[E0061]: this function takes 4 parameters but 2 parameters were supplied --> src/tools/clippy/clippy_lints/src/write.rs:295:26 | 295 | let mut fmt_parser = Parser::new(&tmp, None); | ^^^^^^^^^^^^^^^^^^^^^^^ expected 4 parameters Added: head/lang/rust-nightly/files/patch-clippy (contents, props changed) Added: head/lang/rust-nightly/files/patch-clippy ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/rust-nightly/files/patch-clippy Sat Dec 29 03:24:51 2018 (r488649) @@ -0,0 +1,82 @@ +https://github.com/rust-lang/rust-clippy/commit/99454bc9a1d5 +https://github.com/rust-lang/rust-clippy/commit/909bfd3cd843 + +--- src/tools/clippy/clippy_lints/src/loops.rs.orig 2018-12-28 20:04:28 UTC ++++ src/tools/clippy/clippy_lints/src/loops.rs +@@ -751,7 +751,8 @@ fn never_loop_expr(expr: &Expr, main_loop_id: NodeId) + | ExprKind::Closure(_, _, _, _, _) + | ExprKind::InlineAsm(_, _, _) + | ExprKind::Path(_) +- | ExprKind::Lit(_) => NeverLoopResult::Otherwise, ++ | ExprKind::Lit(_) ++ | ExprKind::Err => NeverLoopResult::Otherwise, + } + } + +--- src/tools/clippy/clippy_lints/src/utils/author.rs.orig 2018-12-28 20:04:28 UTC ++++ src/tools/clippy/clippy_lints/src/utils/author.rs +@@ -504,6 +504,9 @@ impl<'tcx> Visitor<'tcx> for PrintVisitor { + self.current = value_pat; + self.visit_expr(value); + }, ++ ExprKind::Err => { ++ println!("Err = {}", current); ++ }, + } + } + +--- src/tools/clippy/clippy_lints/src/utils/hir_utils.rs.orig 2018-12-28 20:04:28 UTC ++++ src/tools/clippy/clippy_lints/src/utils/hir_utils.rs +@@ -615,6 +615,7 @@ impl<'a, 'tcx: 'a> SpanlessHash<'a, 'tcx> { + self.hash_name(l.ident.name); + } + }, ++ ExprKind::Err => {}, + } + } + +--- src/tools/clippy/clippy_lints/src/utils/inspector.rs.orig 2018-12-28 20:04:28 UTC ++++ src/tools/clippy/clippy_lints/src/utils/inspector.rs +@@ -347,6 +347,9 @@ fn print_expr(cx: &LateContext<'_, '_>, expr: &hir::Ex + println!("{}repeat count:", ind); + print_expr(cx, &cx.tcx.hir().body(anon_const.body).value, indent + 1); + }, ++ hir::ExprKind::Err => { ++ println!("{}Err", ind); ++ }, + } + } + +--- src/tools/clippy/clippy_lints/src/utils/sugg.rs.orig 2018-12-28 20:04:28 UTC ++++ src/tools/clippy/clippy_lints/src/utils/sugg.rs +@@ -79,7 +79,8 @@ impl<'a> Sugg<'a> { + | hir::ExprKind::Ret(..) + | hir::ExprKind::Struct(..) + | hir::ExprKind::Tup(..) +- | hir::ExprKind::While(..) => Sugg::NonParen(snippet), ++ | hir::ExprKind::While(..) ++ | hir::ExprKind::Err => Sugg::NonParen(snippet), + hir::ExprKind::Assign(..) => Sugg::BinOp(AssocOp::Assign, snippet), + hir::ExprKind::AssignOp(op, ..) => Sugg::BinOp(hirbinop2assignop(op), snippet), + hir::ExprKind::Binary(op, ..) => Sugg::BinOp(AssocOp::from_ast_binop(higher::binop(op.node)), snippet), +@@ -158,7 +159,8 @@ impl<'a> Sugg<'a> { + | ast::ExprKind::Tup(..) + | ast::ExprKind::Array(..) + | ast::ExprKind::While(..) +- | ast::ExprKind::WhileLet(..) => Sugg::NonParen(snippet), ++ | ast::ExprKind::WhileLet(..) ++ | ast::ExprKind::Err => Sugg::NonParen(snippet), + ast::ExprKind::Range(.., RangeLimits::HalfOpen) => Sugg::BinOp(AssocOp::DotDot, snippet), + ast::ExprKind::Range(.., RangeLimits::Closed) => Sugg::BinOp(AssocOp::DotDotEq, snippet), + ast::ExprKind::Assign(..) => Sugg::BinOp(AssocOp::Assign, snippet), +--- src/tools/clippy/clippy_lints/src/write.rs.orig 2018-12-28 20:04:28 UTC ++++ src/tools/clippy/clippy_lints/src/write.rs +@@ -292,7 +292,7 @@ fn check_tts<'a>(cx: &EarlyContext<'a>, tts: &ThinToke + }; + let tmp = fmtstr.clone(); + let mut args = vec![]; +- let mut fmt_parser = Parser::new(&tmp, None); ++ let mut fmt_parser = Parser::new(&tmp, None, Vec::new(), false); + while let Some(piece) = fmt_parser.next() { + if !fmt_parser.errors.is_empty() { + return (None, expr);