Rollup merge of #125522 - spastorino:fix-lint-docs-edition-handling, … · rust-lang/rust@ad37f40 (original) (raw)

File tree

2 files changed

lines changed

2 files changed

lines changed

Original file line number Diff line number Diff line change
@@ -3757,7 +3757,7 @@ declare_lint! {
3757 3757 ///
3758 3758 /// ### Example
3759 3759 ///
3760 - /// ```rust,compile_fail
3760 + /// ```rust,edition2018,compile_fail
3761 3761 /// #![deny(rust_2021_incompatible_or_patterns)]
3762 3762 ///
3763 3763 /// macro_rules! match_any {
@@ -3797,7 +3797,7 @@ declare_lint! {
3797 3797 ///
3798 3798 /// ### Example
3799 3799 ///
3800 - /// ```rust,compile_fail
3800 + /// ```rust,edition2018,compile_fail
3801 3801 /// #![deny(rust_2021_prelude_collisions)]
3802 3802 ///
3803 3803 /// trait Foo {
Original file line number Diff line number Diff line change
@@ -441,10 +441,19 @@ impl<'a> LintExtractor<'a> {
441 441 fs::write(&tempfile, source)
442 442 .map_err(|e
443 443 let mut cmd = Command::new(self.rustc_path);
444 -if options.contains(&"edition2015") {
444 +if options.contains(&"edition2024") {
445 + cmd.arg("--edition=2024");
446 +} else if options.contains(&"edition2021") {
447 + cmd.arg("--edition=2021");
448 +} else if options.contains(&"edition2018") {
449 + cmd.arg("--edition=2018");
450 +} else if options.contains(&"edition2015") {
445 451 cmd.arg("--edition=2015");
452 +} else if options.contains(&"edition") {
453 +panic!("lint-docs: unknown edition");
446 454 } else {
447 - cmd.arg("--edition=2018");
455 +// defaults to latest edition
456 + cmd.arg("--edition=2021");
448 457 }
449 458 cmd.arg("--error-format=json");
450 459 cmd.arg("--target").arg(self.rustc_target);