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.

Sign up for GitHub

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

Implement const expressions and patterns (RFC 2920) #77124

Merged
merged 11 commits into from
Oct 17, 2020
Merged

Implement const expressions and patterns (RFC 2920) #77124

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3c4ad55
Add inline_const feature flag
spastorino Sep 21, 2020
c3e8d79
Parse inline const expressions
spastorino Sep 21, 2020
59d07c3
Parse inline const patterns
spastorino Sep 23, 2020
66e2543
Lower inline const's AST to HIR
spastorino Oct 6, 2020
fe922e5
Lower inline const down to MIR
spastorino Oct 6, 2020
85b5ce2
Typeck inline consts
spastorino Oct 6, 2020
54596c9
Add inline const tests
spastorino Oct 6, 2020
27411d6
Handle ExprKind::ConstBlock on clippy
spastorino Oct 6, 2020
03defb6
Add check_generic_arg early pass
spastorino Oct 9, 2020
547e5eb
Do not check unused braces on inline consts
spastorino Oct 9, 2020
03321b8
Add inline const to INCOMPLETE_FEATURES
spastorino Oct 16, 2020
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
Prev Previous commit
Next Next commit
Do not check unused braces on inline consts
  • Loading branch information
@spastorino
spastorino committed Oct 16, 2020
commit 547e5eb49884e521b8a75bf13ad76eb421ca4688
71 changes: 53 additions & 18 deletions compiler/rustc_lint/src/unused.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,10 +839,6 @@ impl EarlyLintPass for UnusedParens {
}
}

fn check_anon_const(&mut self, cx: &EarlyContext<'_>, c: &ast::AnonConst) {
self.check_unused_delims_expr(cx, &c.value, UnusedDelimsCtx::AnonConst, false, None, None);
}

fn check_stmt(&mut self, cx: &EarlyContext<'_>, s: &ast::Stmt) {
if let StmtKind::Local(ref local) = s.kind {
self.check_unused_parens_pat(cx, &local.pat, false, false);
Expand Down Expand Up @@ -965,13 +961,6 @@ impl UnusedDelimLint for UnusedBraces {
if !Self::is_expr_delims_necessary(expr, followed_by_block)
&& (ctx != UnusedDelimsCtx::AnonConst
|| matches!(expr.kind, ast::ExprKind::Lit(_)))
// array length expressions are checked during `check_anon_const` and `check_ty`,
// once as `ArrayLenExpr` and once as `AnonConst`.
//
// As we do not want to lint this twice, we do not emit an error for
// `ArrayLenExpr` if `AnonConst` would do the same.
&& (ctx != UnusedDelimsCtx::ArrayLenExpr
|| !matches!(expr.kind, ast::ExprKind::Lit(_)))
&& !cx.sess().source_map().is_multiline(value.span)
&& value.attrs.is_empty()
&& !value.span.from_expansion()
Expand Down Expand Up @@ -999,21 +988,54 @@ impl UnusedDelimLint for UnusedBraces {
}

impl EarlyLintPass for UnusedBraces {
fn check_stmt(&mut self, cx: &EarlyContext<'_>, s: &ast::Stmt) {
<Self as UnusedDelimLint>::check_stmt(self, cx, s)
}

fn check_expr(&mut self, cx: &EarlyContext<'_>, e: &ast::Expr) {
<Self as UnusedDelimLint>::check_expr(self, cx, e)
<Self as UnusedDelimLint>::check_expr(self, cx, e);

if let ExprKind::Repeat(_, ref anon_const) = e.kind {
self.check_unused_delims_expr(
cx,
&anon_const.value,
UnusedDelimsCtx::AnonConst,
false,
None,
None,
);
}
}

fn check_anon_const(&mut self, cx: &EarlyContext<'_>, c: &ast::AnonConst) {
self.check_unused_delims_expr(cx, &c.value, UnusedDelimsCtx::AnonConst, false, None, None);
fn check_generic_arg(&mut self, cx: &EarlyContext<'_>, arg: &ast::GenericArg) {
if let ast::GenericArg::Const(ct) = arg {
self.check_unused_delims_expr(
cx,
&ct.value,
UnusedDelimsCtx::AnonConst,
false,
None,
None,
);
}
}

fn check_stmt(&mut self, cx: &EarlyContext<'_>, s: &ast::Stmt) {
<Self as UnusedDelimLint>::check_stmt(self, cx, s)
fn check_variant(&mut self, cx: &EarlyContext<'_>, v: &ast::Variant) {
if let Some(anon_const) = &v.disr_expr {
self.check_unused_delims_expr(
cx,
&anon_const.value,
UnusedDelimsCtx::AnonConst,
false,
None,
None,
);
}
}

fn check_ty(&mut self, cx: &EarlyContext<'_>, ty: &ast::Ty) {
if let &ast::TyKind::Paren(ref r) = &ty.kind {
if let ast::TyKind::Array(_, ref len) = r.kind {
match ty.kind {
ast::TyKind::Array(_, ref len) => {
self.check_unused_delims_expr(
cx,
&len.value,
Expand All @@ -1023,6 +1045,19 @@ impl EarlyLintPass for UnusedBraces {
None,
);
}

ast::TyKind::Typeof(ref anon_const) => {
self.check_unused_delims_expr(
cx,
&anon_const.value,
UnusedDelimsCtx::AnonConst,
false,
None,
None,
);
}

_ => {}
}
}

Expand Down