]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #98059 - tmiasko:inline-const-eval-select, r=Amanieu
authorYuki Okushi <jtitor@2k36.org>
Wed, 15 Jun 2022 22:24:41 +0000 (07:24 +0900)
committerGitHub <noreply@github.com>
Wed, 15 Jun 2022 22:24:41 +0000 (07:24 +0900)
Inline `const_eval_select`

To avoid circular link time dependency between core and compiler
builtins when building with `-Zshare-generics`.

r? ```@Amanieu```

library/core/src/intrinsics.rs

index 7c10ed65c4c4c2c32f373d999f03acf07851c523..43ba2dc28749005629bd7d413dbc5127ccac671a 100644 (file)
@@ -2363,6 +2363,7 @@ pub(crate) fn is_nonoverlapping<T>(src: *const T, dst: *const T, count: usize) -
 #[rustc_const_unstable(feature = "const_eval_select", issue = "none")]
 #[lang = "const_eval_select"]
 #[rustc_do_not_const_check]
+#[inline]
 pub const unsafe fn const_eval_select<ARG, F, G, RET>(
     arg: ARG,
     _called_in_const: F,