diff options
| author | bors <bors@rust-lang.org> | 2019-06-08 23:17:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-08 23:17:06 +0000 |
| commit | 053666f9062d71091ea7970dcbad5963097191a3 (patch) | |
| tree | fa334bba0a1d0e0b7546d5e3a2c51242d0245e27 /src/test/codegen/function-arguments.rs | |
| parent | 991c719a1d0f95c37ed7ea56bdb38bcc2a6246b9 (diff) | |
| parent | e0c825cc72e3d7834e3493e12e673c25606c8293 (diff) | |
| download | rust-053666f9062d71091ea7970dcbad5963097191a3.tar.gz rust-053666f9062d71091ea7970dcbad5963097191a3.zip | |
Auto merge of #61672 - Centril:rollup-jxo89ir, r=Centril
Rollup of 6 pull requests Successful merges: - #61646 (Remove useless allocations in macro_rules follow logic.) - #61658 (remove useless ident() functions in const tests) - #61660 (Minimize use of `#![feature(custom_attribute)]`) - #61666 (Add test for trait ICE) - #61669 ( syntax: Remove `Deref` impl from `Token`) - #61670 (Update RLS) Failed merges: r? @ghost
Diffstat (limited to 'src/test/codegen/function-arguments.rs')
| -rw-r--r-- | src/test/codegen/function-arguments.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/codegen/function-arguments.rs b/src/test/codegen/function-arguments.rs index c2d697fd046..bd121ef24ad 100644 --- a/src/test/codegen/function-arguments.rs +++ b/src/test/codegen/function-arguments.rs @@ -2,7 +2,7 @@ // ignore-tidy-linelength #![crate_type = "lib"] -#![feature(custom_attribute)] +#![feature(rustc_attrs)] pub struct S { _field: [i32; 8], @@ -146,7 +146,7 @@ pub fn enum_id_2(x: Option<u8>) -> Option<u8> { // CHECK: noalias i8* @allocator() #[no_mangle] -#[allocator] +#[rustc_allocator] pub fn allocator() -> *const i8 { std::ptr::null() } |