Skip to content

Commit 301d247

Browse files
RalfJungRalfJung
committed
remove support for the #[start] attribute
1 parent cdf26a1 commit 301d247

23 files changed

+77
-121
lines changed

‎build_system/src/test.rs

-26
Original file line numberDiff line numberDiff line change
@@ -426,19 +426,6 @@ fn std_tests(env: &Env, args: &TestArg) -> Result<(), String> {
426426
run_command_with_env(&command, None, Some(env))?;
427427
maybe_run_command_in_vm(&[&cargo_target_dir.join("track-caller-attribute")], env, args)?;
428428

429-
// FIXME: create a function "display_if_not_quiet" or something along the line.
430-
println!("[AOT] mod_bench");
431-
let mut command = args.config_info.rustc_command_vec();
432-
command.extend_from_slice(&[
433-
&"example/mod_bench.rs",
434-
&"--crate-type",
435-
&"bin",
436-
&"--target",
437-
&args.config_info.target_triple,
438-
]);
439-
run_command_with_env(&command, None, Some(env))?;
440-
// FIXME: the compiled binary is not run.
441-
442429
Ok(())
443430
}
444431

@@ -696,19 +683,6 @@ fn test_libcore(env: &Env, args: &TestArg) -> Result<(), String> {
696683
Ok(())
697684
}
698685

699-
// echo "[BENCH COMPILE] mod_bench"
700-
//
701-
// COMPILE_MOD_BENCH_INLINE="$RUSTC example/mod_bench.rs --crate-type bin -Zmir-opt-level=3 -O --crate-name mod_bench_inline"
702-
// COMPILE_MOD_BENCH_LLVM_0="rustc example/mod_bench.rs --crate-type bin -Copt-level=0 -o $cargo_target_dir/mod_bench_llvm_0 -Cpanic=abort"
703-
// COMPILE_MOD_BENCH_LLVM_1="rustc example/mod_bench.rs --crate-type bin -Copt-level=1 -o $cargo_target_dir/mod_bench_llvm_1 -Cpanic=abort"
704-
// COMPILE_MOD_BENCH_LLVM_2="rustc example/mod_bench.rs --crate-type bin -Copt-level=2 -o $cargo_target_dir/mod_bench_llvm_2 -Cpanic=abort"
705-
// COMPILE_MOD_BENCH_LLVM_3="rustc example/mod_bench.rs --crate-type bin -Copt-level=3 -o $cargo_target_dir/mod_bench_llvm_3 -Cpanic=abort"
706-
//
707-
// Use 100 runs, because a single compilations doesn't take more than ~150ms, so it isn't very slow
708-
// hyperfine --runs ${COMPILE_RUNS:-100} "$COMPILE_MOD_BENCH_INLINE" "$COMPILE_MOD_BENCH_LLVM_0" "$COMPILE_MOD_BENCH_LLVM_1" "$COMPILE_MOD_BENCH_LLVM_2" "$COMPILE_MOD_BENCH_LLVM_3"
709-
// echo "[BENCH RUN] mod_bench"
710-
// hyperfine --runs ${RUN_RUNS:-10} $cargo_target_dir/mod_bench{,_inline} $cargo_target_dir/mod_bench_llvm_*
711-
712686
fn extended_rand_tests(env: &Env, args: &TestArg) -> Result<(), String> {
713687
if !args.is_using_gcc_master_branch() {
714688
println!("Not using GCC master branch. Skipping `extended_rand_tests`.");

‎example/alloc_example.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
#![feature(start, core_intrinsics, alloc_error_handler, lang_items)]
1+
#![feature(core_intrinsics, alloc_error_handler, lang_items)]
22
#![no_std]
3+
#![no_main]
34
#![allow(internal_features)]
45

56
extern crate alloc;
@@ -37,8 +38,8 @@ unsafe extern "C" fn _Unwind_Resume() {
3738
core::intrinsics::unreachable();
3839
}
3940

40-
#[start]
41-
fn main(_argc: isize, _argv: *const *const u8) -> isize {
41+
#[no_mangle]
42+
extern "C" fn main(_argc: core::ffi::c_int, _argv: *const *const u8) -> core::ffi::c_int {
4243
let world: Box<&str> = Box::new("Hello World!\0");
4344
unsafe {
4445
puts(*world as *const str as *const u8);

‎example/mini_core_hello_world.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Adapted from https://github.com/sunfishcode/mir2cranelift/blob/master/rust-examples/nocore-hello-world.rs
22

33
#![feature(
4-
no_core, unboxed_closures, start, lang_items, never_type, linkage,
4+
no_core, unboxed_closures, lang_items, never_type, linkage,
55
extern_types, thread_local
66
)]
77
#![no_core]

‎example/mod_bench.rs

-36
This file was deleted.

‎src/context.rs

-1
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,6 @@ impl<'gcc, 'tcx> MiscCodegenMethods<'tcx> for CodegenCx<'gcc, 'tcx> {
513513
} else {
514514
// If the symbol already exists, it is an error: for example, the user wrote
515515
// #[no_mangle] extern "C" fn main(..) {..}
516-
// instead of #[start]
517516
None
518517
}
519518
}

‎tests/run/abort1.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
// Run-time:
44
// status: signal
55

6-
#![feature(auto_traits, lang_items, no_core, start, intrinsics, rustc_attrs)]
6+
#![feature(auto_traits, lang_items, no_core, intrinsics, rustc_attrs)]
77
#![allow(internal_features)]
88

99
#![no_std]
1010
#![no_core]
11+
#![no_main]
1112

1213
/*
1314
* Core
@@ -49,7 +50,7 @@ fn test_fail() -> ! {
4950
unsafe { intrinsics::abort() };
5051
}
5152

52-
#[start]
53-
fn main(mut argc: isize, _argv: *const *const u8) -> isize {
53+
#[no_mangle]
54+
extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
5455
test_fail();
5556
}

‎tests/run/abort2.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
// Run-time:
44
// status: signal
55

6-
#![feature(auto_traits, lang_items, no_core, start, intrinsics, rustc_attrs)]
6+
#![feature(auto_traits, lang_items, no_core, intrinsics, rustc_attrs)]
77
#![allow(internal_features)]
88

99
#![no_std]
1010
#![no_core]
11+
#![no_main]
1112

1213
/*
1314
* Core
@@ -50,8 +51,8 @@ fn fail() -> i32 {
5051
0
5152
}
5253

53-
#[start]
54-
fn main(mut argc: isize, _argv: *const *const u8) -> isize {
54+
#[no_mangle]
55+
extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
5556
fail();
5657
0
5758
}

‎tests/run/array.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@
77
// 5
88
// 10
99

10-
#![feature(no_core, start)]
10+
#![feature(no_core)]
1111

1212
#![no_std]
1313
#![no_core]
14+
#![no_main]
1415

1516
extern crate mini_core;
1617

@@ -28,8 +29,8 @@ fn make_array() -> [u8; 3] {
2829
[42, 10, 5]
2930
}
3031

31-
#[start]
32-
fn main(argc: isize, _argv: *const *const u8) -> isize {
32+
#[no_mangle]
33+
extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
3334
let array = [42, 7, 5];
3435
let array2 = make_array();
3536
unsafe {

‎tests/run/assign.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
// 10
77

88
#![allow(internal_features, unused_attributes)]
9-
#![feature(auto_traits, lang_items, no_core, start, intrinsics, rustc_attrs, track_caller)]
9+
#![feature(auto_traits, lang_items, no_core, intrinsics, rustc_attrs, track_caller)]
1010

1111
#![no_std]
1212
#![no_core]
13+
#![no_main]
1314

1415
/*
1516
* Core
@@ -142,8 +143,8 @@ fn inc(num: isize) -> isize {
142143
}
143144

144145

145-
#[start]
146-
fn main(mut argc: isize, _argv: *const *const u8) -> isize {
146+
#[no_mangle]
147+
extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
147148
argc = inc(argc);
148149
unsafe {
149150
libc::printf(b"%ld\n\0" as *const u8 as *const i8, argc);

‎tests/run/closure.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
// Int argument: 2
99
// Both args: 11
1010

11-
#![feature(no_core, start)]
11+
#![feature(no_core)]
1212

1313
#![no_std]
1414
#![no_core]
15+
#![no_main]
1516

1617
extern crate mini_core;
1718

@@ -22,8 +23,8 @@ mod libc {
2223
}
2324
}
2425

25-
#[start]
26-
fn main(mut argc: isize, _argv: *const *const u8) -> isize {
26+
#[no_mangle]
27+
extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
2728
let string = "Arg: %d\n\0";
2829
let mut closure = || {
2930
unsafe {

‎tests/run/condition.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
// stdout: true
66
// 1
77

8-
#![feature(no_core, start)]
8+
#![feature(no_core)]
99

1010
#![no_std]
1111
#![no_core]
12+
#![no_main]
1213

1314
extern crate mini_core;
1415

@@ -19,8 +20,8 @@ mod libc {
1920
}
2021
}
2122

22-
#[start]
23-
fn main(argc: isize, _argv: *const *const u8) -> isize {
23+
#[no_mangle]
24+
extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
2425
unsafe {
2526
if argc == 1 {
2627
libc::printf(b"true\n\0" as *const u8 as *const i8);

‎tests/run/empty_main.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
// Run-time:
44
// status: 0
55

6-
#![feature(auto_traits, lang_items, no_core, start)]
6+
#![feature(auto_traits, lang_items, no_core)]
77
#![allow(internal_features)]
88

99
#![no_std]
1010
#![no_core]
11+
#![no_main]
1112

1213
/*
1314
* Core
@@ -34,7 +35,7 @@ pub(crate) unsafe auto trait Freeze {}
3435
* Code
3536
*/
3637

37-
#[start]
38-
fn main(_argc: isize, _argv: *const *const u8) -> isize {
38+
#[no_mangle]
39+
extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
3940
0
4041
}

‎tests/run/exit.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
// Run-time:
44
// status: 2
55

6-
#![feature(auto_traits, lang_items, no_core, start, intrinsics)]
6+
#![feature(auto_traits, lang_items, no_core, intrinsics)]
77
#![allow(internal_features)]
88

99
#![no_std]
1010
#![no_core]
11+
#![no_main]
1112

1213
mod libc {
1314
#[link(name = "c")]
@@ -41,8 +42,8 @@ pub(crate) unsafe auto trait Freeze {}
4142
* Code
4243
*/
4344

44-
#[start]
45-
fn main(mut argc: isize, _argv: *const *const u8) -> isize {
45+
#[no_mangle]
46+
extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
4647
unsafe {
4748
libc::exit(2);
4849
}

‎tests/run/exit_code.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
// Run-time:
44
// status: 1
55

6-
#![feature(auto_traits, lang_items, no_core, start)]
6+
#![feature(auto_traits, lang_items, no_core)]
77
#![allow(internal_features)]
88

99
#![no_std]
1010
#![no_core]
11+
#![no_main]
1112

1213
/*
1314
* Core
@@ -34,7 +35,7 @@ pub(crate) unsafe auto trait Freeze {}
3435
* Code
3536
*/
3637

37-
#[start]
38-
fn main(mut argc: isize, _argv: *const *const u8) -> isize {
38+
#[no_mangle]
39+
extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
3940
1
4041
}

‎tests/run/fun_ptr.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
// status: 0
55
// stdout: 1
66

7-
#![feature(no_core, start)]
7+
#![feature(no_core)]
88

99
#![no_std]
1010
#![no_core]
11+
#![no_main]
1112

1213
extern crate mini_core;
1314

@@ -26,8 +27,8 @@ fn call_func(func: fn(i16) -> i8, param: i16) -> i8 {
2627
func(param)
2728
}
2829

29-
#[start]
30-
fn main(argc: isize, _argv: *const *const u8) -> isize {
30+
#[no_mangle]
31+
extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
3132
unsafe {
3233
let result = call_func(i16_as_i8, argc as i16) as isize;
3334
libc::printf(b"%ld\n\0" as *const u8 as *const i8, result);

‎tests/run/mut_ref.rs

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
// 11
99

1010
#![allow(internal_features, unused_attributes)]
11-
#![feature(auto_traits, lang_items, no_core, start, intrinsics, rustc_attrs, track_caller)]
11+
#![feature(auto_traits, lang_items, no_core, intrinsics, rustc_attrs, track_caller)]
1212

1313
#![no_std]
1414
#![no_core]
15+
#![no_main]
1516

1617
/*
1718
* Core
@@ -148,8 +149,8 @@ fn update_num(num: &mut isize) {
148149
*num = *num + 5;
149150
}
150151

151-
#[start]
152-
fn main(mut argc: isize, _argv: *const *const u8) -> isize {
152+
#[no_mangle]
153+
extern "C" fn main(argc: i32, _argv: *const *const u8) -> i32 {
153154
let mut test = test(argc);
154155
unsafe {
155156
libc::printf(b"%ld\n\0" as *const u8 as *const i8, test.field);

0 commit comments

Comments
 (0)