From daf93df430eddbaeb31fea2fcb91c974b0b7bcf5 Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei Date: Tue, 22 Nov 2022 07:29:39 +0800 Subject: [PATCH 1/7] restore control flow on error in EUV --- .../rustc_hir_typeck/src/expr_use_visitor.rs | 17 +++++++++++------ compiler/rustc_hir_typeck/src/upvar.rs | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/compiler/rustc_hir_typeck/src/expr_use_visitor.rs b/compiler/rustc_hir_typeck/src/expr_use_visitor.rs index 275f7d12148..e5e798f4b93 100644 --- a/compiler/rustc_hir_typeck/src/expr_use_visitor.rs +++ b/compiler/rustc_hir_typeck/src/expr_use_visitor.rs @@ -252,11 +252,11 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> { hir::ExprKind::Match(ref discr, arms, _) => { let discr_place = return_if_err!(self.mc.cat_expr(discr)); - self.maybe_read_scrutinee( + return_if_err!(self.maybe_read_scrutinee( discr, discr_place.clone(), arms.iter().map(|arm| arm.pat), - ); + )); // treatment of the discriminant is handled while walking the arms. for arm in arms { @@ -390,7 +390,7 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> { discr: &Expr<'_>, discr_place: PlaceWithHirId<'tcx>, pats: impl Iterator>, - ) { + ) -> Result<(), ()> { // Matching should not always be considered a use of the place, hence // discr does not necessarily need to be borrowed. // We only want to borrow discr if the pattern contain something other @@ -398,7 +398,7 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> { let ExprUseVisitor { ref mc, body_owner: _, delegate: _ } = *self; let mut needs_to_be_read = false; for pat in pats { - return_if_err!(mc.cat_pattern(discr_place.clone(), pat, |place, pat| { + mc.cat_pattern(discr_place.clone(), pat, |place, pat| { match &pat.kind { PatKind::Binding(.., opt_sub_pat) => { // If the opt_sub_pat is None, than the binding does not count as @@ -453,7 +453,7 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> { // examined } } - })); + })? } if needs_to_be_read { @@ -474,6 +474,7 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> { // that the discriminant has been initialized. self.walk_expr(discr); } + Ok(()) } fn walk_local( @@ -490,7 +491,11 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> { f(self); if let Some(els) = els { // borrowing because we need to test the discriminant - self.maybe_read_scrutinee(expr, expr_place.clone(), from_ref(pat).iter()); + return_if_err!(self.maybe_read_scrutinee( + expr, + expr_place.clone(), + from_ref(pat).iter() + )); self.walk_block(els) } self.walk_irrefutable_pat(&expr_place, &pat); diff --git a/compiler/rustc_hir_typeck/src/upvar.rs b/compiler/rustc_hir_typeck/src/upvar.rs index 4dea40829f6..b68508f9e68 100644 --- a/compiler/rustc_hir_typeck/src/upvar.rs +++ b/compiler/rustc_hir_typeck/src/upvar.rs @@ -2184,7 +2184,7 @@ fn determine_place_ancestry_relation<'tcx>( place_a: &Place<'tcx>, place_b: &Place<'tcx>, ) -> PlaceAncestryRelation { - // If Place A and Place B, don't start off from the same root variable, they are divergent. + // If Place A and Place B don't start off from the same root variable, they are divergent. if place_a.base != place_b.base { return PlaceAncestryRelation::Divergent; } From e598af6f2710464e20a796d0d3eba642747bcbe3 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 24 Nov 2022 09:38:14 +0100 Subject: [PATCH 2/7] feat: implement TcpStream shutdown for wasm32-wasi Signed-off-by: Harald Hoyer --- library/std/src/sys/wasi/net.rs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/library/std/src/sys/wasi/net.rs b/library/std/src/sys/wasi/net.rs index 590d268c380..cf4ebba1a39 100644 --- a/library/std/src/sys/wasi/net.rs +++ b/library/std/src/sys/wasi/net.rs @@ -119,8 +119,14 @@ impl TcpStream { unsupported() } - pub fn shutdown(&self, _: Shutdown) -> io::Result<()> { - unsupported() + pub fn shutdown(&self, how: Shutdown) -> io::Result<()> { + let wasi_how = match how { + Shutdown::Read => wasi::SDFLAGS_RD, + Shutdown::Write => wasi::SDFLAGS_WR, + Shutdown::Both => wasi::SDFLAGS_RD | wasi::SDFLAGS_WR, + }; + + unsafe { wasi::sock_shutdown(self.socket().as_raw_fd() as _, wasi_how).map_err(err2io) } } pub fn duplicate(&self) -> io::Result { From 9cd12cdf788e3bc46ff72ec7f77448316cfa64c3 Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei Date: Mon, 28 Nov 2022 01:48:35 +0800 Subject: [PATCH 3/7] inference test for #104649 --- src/test/ui/inference/issue-104649.rs | 32 +++++++++++++++++++++++ src/test/ui/inference/issue-104649.stderr | 14 ++++++++++ 2 files changed, 46 insertions(+) create mode 100644 src/test/ui/inference/issue-104649.rs create mode 100644 src/test/ui/inference/issue-104649.stderr diff --git a/src/test/ui/inference/issue-104649.rs b/src/test/ui/inference/issue-104649.rs new file mode 100644 index 00000000000..4637b884d44 --- /dev/null +++ b/src/test/ui/inference/issue-104649.rs @@ -0,0 +1,32 @@ +type Result = ::std::result::Result; +struct Error; + +trait ForEach { + type Input; + fn for_each(self, f: F) + where + F: FnOnce(Self::Input) -> U; +} + +impl ForEach for A { + type Input = T; + fn for_each(self, f: F) + where + F: FnOnce(Self::Input) -> U, + { + todo!() + } +} + +struct A(T); + +fn main() { + let a = A(Result::Ok(Result::Ok(()))); //~ ERROR type annotations needed + a.for_each(|a: Result<_>| { + let f = || match a { + Ok(Ok(a)) => {} + Ok(Err(a)) => {} + Err(a) => {} + }; + }); +} diff --git a/src/test/ui/inference/issue-104649.stderr b/src/test/ui/inference/issue-104649.stderr new file mode 100644 index 00000000000..4962b21f9fd --- /dev/null +++ b/src/test/ui/inference/issue-104649.stderr @@ -0,0 +1,14 @@ +error[E0282]: type annotations needed for `A, Error>>` + --> $DIR/issue-104649.rs:24:9 + | +LL | let a = A(Result::Ok(Result::Ok(()))); + | ^ + | +help: consider giving `a` an explicit type, where the type for type parameter `E` is specified + | +LL | let a: A, Error>> = A(Result::Ok(Result::Ok(()))); + | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0282`. From b788cb00716b099abf1fe4c5ae3cb3342911af15 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Wed, 30 Nov 2022 08:51:43 +1100 Subject: [PATCH 4/7] Add Nicholas Nethercote to `.mailmap`. Before: ``` $ git shortlog -se | grep Nethercote 517 Nicholas Nethercote 2 Nicholas Nethercote 560 Nicholas Nethercote ``` After ``` $ git shortlog -se | grep Nethercote 1079 Nicholas Nethercote ``` --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index 4ef723e5146..68161699486 100644 --- a/.mailmap +++ b/.mailmap @@ -396,6 +396,8 @@ Nathaniel Herman Nathaniel Herman Ngo Iok Ui (Wu Yu Wei) Nicholas Baron +Nicholas Nethercote +Nicholas Nethercote Nick Platt Niclas Schwarzlose <15schnic@gmail.com> Nicolas Abram From bf4a62c381db9adb252143dacf6738d74ed0ba58 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Tue, 29 Nov 2022 11:50:03 +1100 Subject: [PATCH 5/7] Fix an ICE parsing a malformed literal in `concat_bytes!`. Fixes #104769. --- .../rustc_builtin_macros/src/concat_bytes.rs | 6 +++++- .../issue-104769-concat_bytes-invalid-literal.rs | 8 ++++++++ ...ue-104769-concat_bytes-invalid-literal.stderr | 16 ++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.rs create mode 100644 src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.stderr diff --git a/compiler/rustc_builtin_macros/src/concat_bytes.rs b/compiler/rustc_builtin_macros/src/concat_bytes.rs index 87658e60e9d..161e3499584 100644 --- a/compiler/rustc_builtin_macros/src/concat_bytes.rs +++ b/compiler/rustc_builtin_macros/src/concat_bytes.rs @@ -2,6 +2,7 @@ use rustc_ast as ast; use rustc_ast::{ptr::P, tokenstream::TokenStream}; use rustc_errors::Applicability; use rustc_expand::base::{self, DummyResult}; +use rustc_session::errors::report_lit_error; use rustc_span::Span; /// Emits errors for literal expressions that are invalid inside and outside of an array. @@ -68,7 +69,10 @@ fn invalid_type_err( Ok(ast::LitKind::Int(_, _)) => { cx.span_err(span, "numeric literal is not a `u8`"); } - _ => unreachable!(), + Ok(ast::LitKind::ByteStr(_) | ast::LitKind::Byte(_)) => unreachable!(), + Err(err) => { + report_lit_error(&cx.sess.parse_sess, err, token_lit, span); + } } } diff --git a/src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.rs b/src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.rs new file mode 100644 index 00000000000..24150376ef0 --- /dev/null +++ b/src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.rs @@ -0,0 +1,8 @@ +#![feature(concat_bytes)] + +fn main() { + concat_bytes!(7Y); + //~^ ERROR invalid suffix `Y` for number literal + concat_bytes!(888888888888888888888888888888888888888); + //~^ ERROR integer literal is too large +} diff --git a/src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.stderr b/src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.stderr new file mode 100644 index 00000000000..8d70faa494d --- /dev/null +++ b/src/test/ui/macros/issue-104769-concat_bytes-invalid-literal.stderr @@ -0,0 +1,16 @@ +error: invalid suffix `Y` for number literal + --> $DIR/issue-104769-concat_bytes-invalid-literal.rs:4:19 + | +LL | concat_bytes!(7Y); + | ^^ invalid suffix `Y` + | + = help: the suffix must be one of the numeric types (`u32`, `isize`, `f32`, etc.) + +error: integer literal is too large + --> $DIR/issue-104769-concat_bytes-invalid-literal.rs:6:19 + | +LL | concat_bytes!(888888888888888888888888888888888888888); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +error: aborting due to 2 previous errors + From b2e05f6400ca6b0fd0d6b09670547e7796cceb24 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Wed, 30 Nov 2022 13:01:17 +1100 Subject: [PATCH 6/7] Add bors to `.mailmap`. Before: ``` $ git shortlog -se | grep "\" 27755 bors 5729 bors[bot] <26634292+bors[bot]@users.noreply.github.com> 995 bors[bot] ``` After: ``` $ git shortlog -se | grep "\" 34479 bors ``` --- .mailmap | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.mailmap b/.mailmap index 4ef723e5146..7ba7a9c07f8 100644 --- a/.mailmap +++ b/.mailmap @@ -73,6 +73,8 @@ Björn Steinbrink blake2-ppc boolean_coercion Boris Egorov +bors bors[bot] <26634292+bors[bot]@users.noreply.github.com> +bors bors[bot] Braden Nelson Brandon Sanderson Brandon Sanderson Brett Cannon Brett Cannon From 3593a5d74ec751cd93f0a12be0801fa2de173216 Mon Sep 17 00:00:00 2001 From: Nicholas Nethercote Date: Wed, 30 Nov 2022 13:08:43 +1100 Subject: [PATCH 7/7] Add dependabot to `.mailmap`. Before: ``` $ git shortlog -se | grep "depend" 44 dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> 6 dependabot-preview[bot] 4 dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 74 dependabot[bot] 93 dependabot[bot] ``` After: ``` $ git shortlog -se | grep "depend" 221 dependabot[bot] ``` --- .mailmap | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.mailmap b/.mailmap index 7ba7a9c07f8..13317ab61fb 100644 --- a/.mailmap +++ b/.mailmap @@ -141,6 +141,10 @@ David Ross David Wood Deadbeef Deadbeef +dependabot[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> +dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> +dependabot[bot] +dependabot[bot] Derek Chiang Derek Chiang (Enchi Jiang) DeveloperC Devin Ragotzy