Skip to content

Commit a90a42b

Browse files
committed
Auto merge of #16022 - Xanewok:no-warn-semicolon-in-expr-from-macros, r=lnicola
internal: Don't explicitly warn against `semicolon_in_expressions_from_macros` This has been warn-by-default for two years now and has already been added to the future-incompat lints in 1.68. See rust-lang/rust#79813 for the tracking issue.
2 parents ceb4426 + a7224c9 commit a90a42b

File tree

38 files changed

+38
-38
lines changed

38 files changed

+38
-38
lines changed

crates/base-db/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! base_db defines basic database traits. The concrete DB is defined by ide.
22
3-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
3+
#![warn(rust_2018_idioms, unused_lifetimes)]
44

55
mod input;
66
mod change;

crates/cfg/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! cfg defines conditional compiling options, `cfg` attribute parser and evaluator
22
3-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
3+
#![warn(rust_2018_idioms, unused_lifetimes)]
44

55
mod cfg_expr;
66
mod dnf;

crates/flycheck/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//! another compatible command (f.x. clippy) in a background thread and provide
33
//! LSP diagnostics based on the output of the command.
44
5-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
5+
#![warn(rust_2018_idioms, unused_lifetimes)]
66

77
use std::{
88
ffi::OsString,

crates/hir-def/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//! Note that `hir_def` is a work in progress, so not all of the above is
88
//! actually true.
99
10-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
10+
#![warn(rust_2018_idioms, unused_lifetimes)]
1111
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
1212

1313
#[allow(unused)]

crates/hir-expand/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//! tree originates not from the text of some `FileId`, but from some macro
55
//! expansion.
66
7-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
7+
#![warn(rust_2018_idioms, unused_lifetimes)]
88

99
pub mod db;
1010
pub mod ast_id_map;

crates/hir-ty/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! The type system. We currently use this to infer types for completion, hover
22
//! information and various assists.
3-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
3+
#![warn(rust_2018_idioms, unused_lifetimes)]
44
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
55

66
#[allow(unused)]

crates/hir/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//! from the ide with completions, hovers, etc. It is a (soft, internal) boundary:
1818
//! <https://www.tedinski.com/2018/02/06/system-boundaries.html>.
1919
20-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
20+
#![warn(rust_2018_idioms, unused_lifetimes)]
2121
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
2222
#![recursion_limit = "512"]
2323

crates/ide-assists/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
//! See also this post:
5959
//! <https://rust-analyzer.github.io/blog/2020/09/28/how-to-make-a-light-bulb.html>
6060
61-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
61+
#![warn(rust_2018_idioms, unused_lifetimes)]
6262

6363
#[allow(unused)]
6464
macro_rules! eprintln {

crates/ide-completion/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! `completions` crate provides utilities for generating completions of user input.
22
3-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
3+
#![warn(rust_2018_idioms, unused_lifetimes)]
44

55
mod completions;
66
mod config;

crates/ide-db/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//!
33
//! It is mainly a `HirDatabase` for semantic analysis, plus a `SymbolsDatabase`, for fuzzy search.
44
5-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
5+
#![warn(rust_2018_idioms, unused_lifetimes)]
66

77
mod apply_change;
88

crates/ide-diagnostics/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
//! There are also a couple of ad-hoc diagnostics implemented directly here, we
2424
//! don't yet have a great pattern for how to do them properly.
2525
26-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
26+
#![warn(rust_2018_idioms, unused_lifetimes)]
2727

2828
mod handlers {
2929
pub(crate) mod break_outside_of_loop;

crates/ide-ssr/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
//! Allows searching the AST for code that matches one or more patterns and then replacing that code
44
//! based on a template.
55
6-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
6+
#![warn(rust_2018_idioms, unused_lifetimes)]
77

88
// Feature: Structural Search and Replace
99
//

crates/ide/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//! in this crate.
99
1010
// For proving that RootDatabase is RefUnwindSafe.
11-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
11+
#![warn(rust_2018_idioms, unused_lifetimes)]
1212
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
1313
#![recursion_limit = "128"]
1414

crates/limit/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! limit defines a struct to enforce limits.
22
3-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
3+
#![warn(rust_2018_idioms, unused_lifetimes)]
44

55
#[cfg(feature = "tracking")]
66
use std::sync::atomic::AtomicUsize;

crates/mbe/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//! The tests for this functionality live in another crate:
77
//! `hir_def::macro_expansion_tests::mbe`.
88
9-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
9+
#![warn(rust_2018_idioms, unused_lifetimes)]
1010

1111
mod parser;
1212
mod expander;

crates/parser/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
//!
1818
//! [`Parser`]: crate::parser::Parser
1919
20-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
20+
#![warn(rust_2018_idioms, unused_lifetimes)]
2121
#![allow(rustdoc::private_intra_doc_links)]
2222
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
2323

crates/paths/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Thin wrappers around `std::path`, distinguishing between absolute and
22
//! relative paths.
33
4-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
4+
#![warn(rust_2018_idioms, unused_lifetimes)]
55

66
use std::{
77
borrow::Borrow,

crates/proc-macro-api/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//! is used to provide basic infrastructure for communication between two
66
//! processes: Client (RA itself), Server (the external program)
77
8-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
8+
#![warn(rust_2018_idioms, unused_lifetimes)]
99

1010
pub mod msg;
1111
mod process;

crates/proc-macro-srv/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
1313
#![cfg(any(feature = "sysroot-abi", rust_analyzer))]
1414
#![feature(proc_macro_internals, proc_macro_diagnostic, proc_macro_span)]
15-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
15+
#![warn(rust_2018_idioms, unused_lifetimes)]
1616
#![allow(unreachable_pub)]
1717

1818
extern crate proc_macro;

crates/proc-macro-test/imp/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Exports a few trivial procedural macros for testing.
22
3-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
3+
#![warn(rust_2018_idioms, unused_lifetimes)]
44

55
use proc_macro::{Group, Ident, Literal, Punct, Span, TokenStream, TokenTree};
66

crates/proc-macro-test/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Exports a few trivial procedural macros for testing.
22
3-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
3+
#![warn(rust_2018_idioms, unused_lifetimes)]
44

55
pub static PROC_MACRO_TEST_LOCATION: &str =
66
include_str!(concat!(env!("OUT_DIR"), "/proc_macro_test_location.txt"));

crates/profile/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! A collection of tools for profiling rust-analyzer.
22
3-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
3+
#![warn(rust_2018_idioms, unused_lifetimes)]
44

55
mod stop_watch;
66
mod memory_usage;

crates/project-model/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//! procedural macros).
1616
//! * Lowering of concrete model to a [`base_db::CrateGraph`]
1717
18-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
18+
#![warn(rust_2018_idioms, unused_lifetimes)]
1919

2020
mod manifest_path;
2121
mod cargo_workspace;

crates/rust-analyzer/src/bin/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//!
33
//! Based on cli flags, either spawns an LSP server, or runs a batch analysis
44
5-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
5+
#![warn(rust_2018_idioms, unused_lifetimes)]
66
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
77
#[cfg(feature = "in-rust-tree")]
88
#[allow(unused_extern_crates)]

crates/rust-analyzer/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
//! The `cli` submodule implements some batch-processing analysis, primarily as
1010
//! a debugging aid.
1111
12-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
12+
#![warn(rust_2018_idioms, unused_lifetimes)]
1313

1414
pub mod cli;
1515

crates/rust-analyzer/tests/slow-tests/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//! specific JSON shapes here -- there's little value in such tests, as we can't
99
//! be sure without a real client anyway.
1010
11-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
11+
#![warn(rust_2018_idioms, unused_lifetimes)]
1212

1313
#[cfg(not(feature = "in-rust-tree"))]
1414
mod sourcegen;

crates/sourcegen/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//!
77
//! This crate contains utilities to make this kind of source-gen easy.
88
9-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
9+
#![warn(rust_2018_idioms, unused_lifetimes)]
1010

1111
use std::{
1212
fmt, fs, mem,

crates/stdx/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Missing batteries for standard libraries.
22
3-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
3+
#![warn(rust_2018_idioms, unused_lifetimes)]
44

55
use std::io as sio;
66
use std::process::Command;

crates/syntax/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
//! [Swift]: <https://github.com/apple/swift/blob/13d593df6f359d0cb2fc81cfaac273297c539455/lib/Syntax/README.md>
2121
2222
#![cfg_attr(feature = "in-rust-tree", feature(rustc_private))]
23-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
23+
#![warn(rust_2018_idioms, unused_lifetimes)]
2424

2525
#[allow(unused)]
2626
macro_rules! eprintln {

crates/test-utils/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//! * Extracting markup (mainly, `$0` markers) out of fixture strings.
77
//! * marks (see the eponymous module).
88
9-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
9+
#![warn(rust_2018_idioms, unused_lifetimes)]
1010

1111
mod assert_linear;
1212
pub mod bench_fixture;

crates/text-edit/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//! so `TextEdit` is the ultimate representation of the work done by
55
//! rust-analyzer.
66
7-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
7+
#![warn(rust_2018_idioms, unused_lifetimes)]
88

99
use itertools::Itertools;
1010
use std::cmp::max;

crates/toolchain/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Discovery of `cargo` & `rustc` executables.
22
3-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
3+
#![warn(rust_2018_idioms, unused_lifetimes)]
44

55
use std::{env, iter, path::PathBuf};
66

crates/tt/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
//! input and output) of macros. It closely mirrors `proc_macro` crate's
33
//! `TokenTree`.
44
5-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
5+
#![warn(rust_2018_idioms, unused_lifetimes)]
66

77
use std::fmt;
88

crates/vfs-notify/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//! Hopefully, one day a reliable file watching/walking crate appears on
88
//! crates.io, and we can reduce this to trivial glue code.
99
10-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
10+
#![warn(rust_2018_idioms, unused_lifetimes)]
1111

1212
use std::fs;
1313

crates/vfs/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
//! [`Handle`]: loader::Handle
3939
//! [`Entries`]: loader::Entry
4040
41-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
41+
#![warn(rust_2018_idioms, unused_lifetimes)]
4242

4343
mod anchored_path;
4444
pub mod file_set;

lib/la-arena/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//! Yet another index-based arena.
22
3-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
3+
#![warn(rust_2018_idioms, unused_lifetimes)]
44
#![warn(missing_docs)]
55

66
use std::{

lib/lsp-server/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//!
55
//! Run with `RUST_LOG=lsp_server=debug` to see all the messages.
66
7-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
7+
#![warn(rust_2018_idioms, unused_lifetimes)]
88

99
mod msg;
1010
mod stdio;

xtask/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//! This binary is integrated into the `cargo` command line by using an alias in
99
//! `.cargo/config`.
1010
11-
#![warn(rust_2018_idioms, unused_lifetimes, semicolon_in_expressions_from_macros)]
11+
#![warn(rust_2018_idioms, unused_lifetimes)]
1212

1313
mod flags;
1414

0 commit comments

Comments
 (0)