Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 8 pull requests #109453

Merged
merged 22 commits into from
Mar 21, 2023
Merged
Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
920435f
Windows: make Command prefer non-verbatim paths
ChrisDenton Dec 2, 2022
746331e
std: drop all messages in bounded channel when destroying the last re…
joboet Feb 17, 2023
642a324
std: add regression test for #107466
joboet Feb 17, 2023
4e9e465
std: disconnect senders before discarding messages
joboet Feb 26, 2023
34aa872
std: leak remaining messages in bounded channel if message destructor…
joboet Mar 14, 2023
322c7b6
Constrain const vars to error if const types are mismatched
compiler-errors Mar 19, 2023
9174edb
Delay overlap errors if errors are involved
compiler-errors Mar 19, 2023
1775722
fix: modify the condition that `resolve_imports` stops
bvanjoi Mar 19, 2023
cbb8066
Avoid ICE of attempt to add with overflow in emitter
chenyukang Mar 20, 2023
93eeb12
Refactor `handle_missing_lit`.
nnethercote Feb 1, 2023
fb9e171
Only implement Fn* traits for extern "Rust" safe function pointers.
oli-obk Mar 21, 2023
91d9131
Deduplicate fn trait compatibility checks
oli-obk Mar 21, 2023
a00413f
Also check function items' signatures for Fn* trait compatibility
oli-obk Mar 21, 2023
3b04ad2
Do not suggest bounds restrictions for synthesized RPITITs
spastorino Mar 21, 2023
1a43859
Rollup merge of #96391 - ChrisDenton:command-non-verbatim, r=joshtrip…
matthiaskrgr Mar 21, 2023
93a82a4
Rollup merge of #108164 - joboet:discard_messages_mpmc_array, r=Amanieu
matthiaskrgr Mar 21, 2023
ee330a3
Rollup merge of #108729 - bvanjoi:fix-issue-97534, r=petrochenkov
matthiaskrgr Mar 21, 2023
081c607
Rollup merge of #109336 - compiler-errors:constrain-to-ct-err, r=BoxyUwU
matthiaskrgr Mar 21, 2023
25b062d
Rollup merge of #109403 - chenyukang:yukang/fix-109396, r=estebank
matthiaskrgr Mar 21, 2023
96f35ed
Rollup merge of #109415 - nnethercote:refactor-handle_missing_lit, r=…
matthiaskrgr Mar 21, 2023
fef1fc4
Rollup merge of #109441 - oli-obk:fn_trait_new_solver, r=compiler-errors
matthiaskrgr Mar 21, 2023
94d2028
Rollup merge of #109446 - spastorino:new-rpitit-17, r=compiler-errors
matthiaskrgr Mar 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 8 additions & 14 deletions compiler/rustc_parse/src/parser/expr.rs
Original file line number Diff line number Diff line change
@@ -1843,20 +1843,14 @@ impl<'a> Parser<'a> {
&mut self,
mk_lit_char: impl FnOnce(Symbol, Span) -> L,
) -> PResult<'a, L> {
if let token::Interpolated(inner) = &self.token.kind {
let expr = match inner.as_ref() {
token::NtExpr(expr) => Some(expr),
token::NtLiteral(expr) => Some(expr),
_ => None,
};
if let Some(expr) = expr {
if matches!(expr.kind, ExprKind::Err) {
let mut err = errors::InvalidInterpolatedExpression { span: self.token.span }
.into_diagnostic(&self.sess.span_diagnostic);
err.downgrade_to_delayed_bug();
return Err(err);
}
}
if let token::Interpolated(nt) = &self.token.kind
&& let token::NtExpr(e) | token::NtLiteral(e) = &**nt
&& matches!(e.kind, ExprKind::Err)
{
let mut err = errors::InvalidInterpolatedExpression { span: self.token.span }
.into_diagnostic(&self.sess.span_diagnostic);
err.downgrade_to_delayed_bug();
return Err(err);
}
let token = self.token.clone();
let err = |self_: &Self| {