diff options
| author | bors <bors@rust-lang.org> | 2021-10-05 06:56:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-10-05 06:56:57 +0000 |
| commit | 074f63648bd2368d5ca19aed02b5763a144e5d05 (patch) | |
| tree | a39ab48aab1c9740253a22c9ac29b32953e97a45 /compiler/rustc_const_eval/src | |
| parent | a804c4b1123ae665a8d4f726524109c49efac5b6 (diff) | |
| parent | 068683baf12f61d5ffbf8a7e4858c4e0c3320f3b (diff) | |
Auto merge of #89549 - Manishearth:rollup-mhkyc16, r=Manishearth
Rollup of 12 pull requests Successful merges: - #87631 (os current_exe using same approach as linux to get always the full ab…) - #88234 (rustdoc-json: Don't ignore impls for primitive types) - #88651 (Use the 64b inner:monotonize() implementation not the 128b one for aarch64) - #88816 (Rustdoc migrate to table so the gui can handle >2k constants) - #89244 (refactor: VecDeques PairSlices fields to private) - #89364 (rustdoc-json: Encode json files with UTF-8) - #89423 (Fix ICE caused by non_exaustive_omitted_patterns struct lint) - #89426 (bootstrap: add config option for nix patching) - #89462 (haiku thread affinity build fix) - #89482 (Follow the diagnostic output style guide) - #89504 (Don't suggest replacing region with 'static in NLL) - #89535 (fix busted JavaScript in error index generator) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_const_eval/src')
| -rw-r--r-- | compiler/rustc_const_eval/src/transform/check_consts/ops.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_const_eval/src/transform/check_consts/ops.rs b/compiler/rustc_const_eval/src/transform/check_consts/ops.rs index f08f51ec627..230d023efb9 100644 --- a/compiler/rustc_const_eval/src/transform/check_consts/ops.rs +++ b/compiler/rustc_const_eval/src/transform/check_consts/ops.rs @@ -102,7 +102,7 @@ impl NonConstOp for FnCallUnstable { ); if ccx.is_const_stable_const_fn() { - err.help("Const-stable functions can only call other const-stable functions"); + err.help("const-stable functions can only call other const-stable functions"); } else if ccx.tcx.sess.is_nightly_build() { if let Some(feature) = feature { err.help(&format!( |