Commit c006eb7

authored

Rollup merge of #140348 - ehuss:lint-docs-edition, r=compiler-errors

Update lint-docs to default to Rust 2024 This updates the lint-docs tool to default to the 2024 edition. The lint docs are supposed to illustrate the code with the latest edition, and I just forgot to update this in #133349. Some docs needed to add the `edition` attribute since they were assuming a particular edition, but were missing the explicit annotation. This also includes a commit to simplify the edition handling in lint-docs.

2 parents 405c8af + 1f108fe commit c006eb7Copy full SHA for c006eb7

File tree

4 files changed

+12

-18

lines changed

compiler
- rustc_lint_defs/src
  - builtin.rs
- rustc_lint/src
  - builtin.rs
  - impl_trait_overcaptures.rs
src/tools/lint-docs/src
- lib.rs

4 files changed

+12

-18

lines changed

`‎compiler/rustc_lint/src/builtin.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -948,7 +948,7 @@ declare_lint! {`
`948`	`948`	`///`
`949`	`949`	`/// ### Example`
`950`	`950`	`///`
`951`		- /// ```rust,compile_fail
	`951`	+ /// ```rust,compile_fail,edition2021
`952`	`952`	`/// #[no_mangle]`
`953`	`953`	`/// const FOO: i32 = 5;`
`954`	`954`	/// ```

`‎compiler/rustc_lint/src/impl_trait_overcaptures.rs‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ declare_lint! {`
`41`	`41`	`///`
`42`	`42`	`/// ### Example`
`43`	`43`	`///`
`44`		- /// ```rust,compile_fail
	`44`	+ /// ```rust,compile_fail,edition2021
`45`	`45`	`/// # #![deny(impl_trait_overcaptures)]`
`46`	`46`	`/// # use std::fmt::Display;`
`47`	`47`	`/// let mut x = vec![];`

`‎compiler/rustc_lint_defs/src/builtin.rs‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1424,7 +1424,7 @@ declare_lint! {`
`1424`	`1424`	`///`
`1425`	`1425`	`/// ### Example`
`1426`	`1426`	`///`
`1427`		- /// ```rust,compile_fail
	`1427`	+ /// ```rust,compile_fail,edition2021
`1428`	`1428`	`/// macro_rules! foo {`
`1429`	`1429`	`/// () => {};`
`1430`	`1430`	`/// ($name) => { };`
`@@ -4128,7 +4128,7 @@ declare_lint! {`
`4128`	`4128`	`///`
`4129`	`4129`	`/// ### Example`
`4130`	`4130`	`///`
`4131`		- /// ```rust,compile_fail
	`4131`	+ /// ```rust,compile_fail,edition2021
`4132`	`4132`	`/// #![deny(dependency_on_unit_never_type_fallback)]`
`4133`	`4133`	`/// fn main() {`
`4134`	`4134`	`/// if true {`

`‎src/tools/lint-docs/src/lib.rs‎`

Lines changed: 8 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -444,21 +444,15 @@ impl<'a> LintExtractor<'a> {`
`444`	`444`	`fs::write(&tempfile, source)`
`445`	`445`	`.map_err(\|e\| format!("failed to write {}: {}", tempfile.display(), e))?;`
`446`	`446`	`let mut cmd = Command::new(self.rustc_path);`
`447`		`- if options.contains(&"edition2024") {`
`448`		`- cmd.arg("--edition=2024");`
`449`		`- cmd.arg("-Zunstable-options");`
`450`		`- } else if options.contains(&"edition2021") {`
`451`		`- cmd.arg("--edition=2021");`
`452`		`- } else if options.contains(&"edition2018") {`
`453`		`- cmd.arg("--edition=2018");`
`454`		`- } else if options.contains(&"edition2015") {`
`455`		`- cmd.arg("--edition=2015");`
`456`		`- } else if options.contains(&"edition") {`
`457`		`- panic!("lint-docs: unknown edition");`
`458`		`- } else {`
	`447`	`+ let edition = options`
	`448`	`+ .iter()`
	`449`	`+ .filter_map(\|opt\| opt.strip_prefix("edition"))`
	`450`	`+ .next()`
`459`	`451`	`// defaults to latest edition`
`460`		`- cmd.arg("--edition=2021");`
`461`		`- }`
	`452`	`+ .unwrap_or("2024");`
	`453`	`+ cmd.arg(format!("--edition={edition}"));`
	`454`	`+ // Just in case this is an unstable edition.`
	`455`	`+ cmd.arg("-Zunstable-options");`
`462`	`456`	`cmd.arg("--error-format=json");`
`463`	`457`	`cmd.arg("--target").arg(self.rustc_target);`
`464`	`458`	`if let Some(target_linker) = self.rustc_linker {`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit c006eb7

File tree

4 files changed

4 files changed

`‎compiler/rustc_lint/src/builtin.rs‎`

`‎compiler/rustc_lint/src/impl_trait_overcaptures.rs‎`

`‎compiler/rustc_lint_defs/src/builtin.rs‎`

`‎src/tools/lint-docs/src/lib.rs‎`

0 commit comments