about summary refs log tree commit diff
path: root/compiler/rustc_llvm/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-03-31 00:29:54 +0000
committerbors <bors@rust-lang.org>2022-03-31 00:29:54 +0000
commita39ac5ae175e0f9f910b1800a430b488ec0f2105 (patch)
tree1901e59455c2d055cf2d8642fccde25040ca35fb /compiler/rustc_llvm/src
parenta40c595695bff3bfb373a8a3355ae4bd4ea64608 (diff)
parentd6c959c680df8e3a68932e42ed919f5664669cc7 (diff)
downloadrust-a39ac5ae175e0f9f910b1800a430b488ec0f2105.tar.gz
rust-a39ac5ae175e0f9f910b1800a430b488ec0f2105.zip
Auto merge of #95501 - Dylan-DPC:rollup-arx6sdc, r=Dylan-DPC
Rollup of 6 pull requests

Successful merges:

 - #93901 (Stabilize native library modifier syntax and the `whole-archive` modifier specifically)
 - #94806 (Fix `cargo run tidy`)
 - #94869 (Add the generic_associated_types_extended feature)
 - #95011 (async: Give predictable name to binding generated from .await expressions.)
 - #95251 (Reduce max hash in raw strings from u16 to u8)
 - #95298 (Fix double drop of allocator in IntoIter impl of Vec)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/src')
-rw-r--r--compiler/rustc_llvm/src/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/src/lib.rs b/compiler/rustc_llvm/src/lib.rs
index 8476c2bfcc4..0324ac3641e 100644
--- a/compiler/rustc_llvm/src/lib.rs
+++ b/compiler/rustc_llvm/src/lib.rs
@@ -1,5 +1,5 @@
 #![feature(nll)]
-#![feature(native_link_modifiers)]
+#![cfg_attr(bootstrap, feature(native_link_modifiers))]
 #![doc(html_root_url = "https://doc.rust-lang.org/nightly/nightly-rustc/")]
 
 // NOTE: This crate only exists to allow linking on mingw targets.