diff options
| author | bors <bors@rust-lang.org> | 2019-10-29 04:12:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-29 04:12:23 +0000 |
| commit | 2dd4e7320e620dc9a59423c55a7db3520ba8b553 (patch) | |
| tree | 3fe15cf8b6933e3d09330cf8f17516a5abe0803c /src/libsyntax_pos | |
| parent | cac68218105f1ba8b6a2a0b21b791951ff02f75d (diff) | |
| parent | 46063ed23fbcd50a7723ee6008e6d63605789e24 (diff) | |
| download | rust-2dd4e7320e620dc9a59423c55a7db3520ba8b553.tar.gz rust-2dd4e7320e620dc9a59423c55a7db3520ba8b553.zip | |
Auto merge of #65919 - Centril:rollup-qrgwnt6, r=Centril
Rollup of 5 pull requests Successful merges: - #65294 (Lint ignored `#[inline]` on function prototypes) - #65318 (Call out the types that are non local on E0117) - #65531 (Update backtrace to 0.3.40) - #65562 (Improve the "try using a variant of the expected type" hint.) - #65809 (Add new EFIAPI ABI) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax_pos')
| -rw-r--r-- | src/libsyntax_pos/symbol.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs index 377d2f877b3..8ba161f55c1 100644 --- a/src/libsyntax_pos/symbol.rs +++ b/src/libsyntax_pos/symbol.rs @@ -110,6 +110,7 @@ symbols! { aarch64_target_feature, abi, abi_amdgpu_kernel, + abi_efiapi, abi_msp430_interrupt, abi_ptx, abi_sysv64, |