Skip to content

Commit c924ba6

Browse files
committed
Auto merge of #122713 - matthiaskrgr:rollup-81grkpm, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - #121258 (Reject overly generic assoc const binding types) - #121823 (never patterns: suggest `!` patterns on non-exhaustive matches) - #122060 (Stabilize `imported_main`) - #122158 (Provide structured suggestion for `#![feature(foo)]`) - #122642 (Improve wording of `Vec::swap_remove`) - #122675 (core: document default attribute stabilization) - #122687 (`NormalizesTo`: return nested goals to caller) - #122693 (Fix heading anchors in doc pages.) - #122699 (Fix a typo in the 1.77.0 relnotes) - #122700 (Remove redundant files, rename base riscv32 file) - #122701 (Detect allocator for box in `must_not_suspend` lint) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 5ca3ad8 + eb9205e commit c924ba6

File tree

3 files changed

+0
-6
lines changed

3 files changed

+0
-6
lines changed

test-cargo-miri/tests/main.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
#![feature(imported_main)]
2-
31
use cargo_miri_test::main;

tests/pass/imported_main.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(imported_main)]
2-
31
pub mod foo {
42
pub fn mymain() {
53
println!("Hello, world!");

tests/pass/main_fn.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(imported_main)]
2-
31
mod foo {
42
pub(crate) fn bar() {}
53
}

0 commit comments

Comments
 (0)