Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 074f636

Browse files
committedOct 5, 2021
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
2 parents a804c4b + 068683b commit 074f636

File tree

94 files changed

+229
-339
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+229
-339
lines changed
 

‎compiler/rustc_borrowck/src/diagnostics/outlives_suggestion.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,7 @@ impl OutlivesSuggestionBuilder {
171171
let outlived_fr_name = self.region_vid_to_name(mbcx, errci.outlived_fr);
172172

173173
if let (Some(fr_name), Some(outlived_fr_name)) = (fr_name, outlived_fr_name) {
174-
if let RegionNameSource::Static = outlived_fr_name.source {
175-
diag.help(&format!("consider replacing `{}` with `'static`", fr_name));
176-
} else {
174+
if !matches!(outlived_fr_name.source, RegionNameSource::Static) {
177175
diag.help(&format!(
178176
"consider adding the following bound: `{}: {}`",
179177
fr_name, outlived_fr_name

‎compiler/rustc_const_eval/src/transform/check_consts/ops.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ impl NonConstOp for FnCallUnstable {
102102
);
103103

104104
if ccx.is_const_stable_const_fn() {
105-
err.help("Const-stable functions can only call other const-stable functions");
105+
err.help("const-stable functions can only call other const-stable functions");
106106
} else if ccx.tcx.sess.is_nightly_build() {
107107
if let Some(feature) = feature {
108108
err.help(&format!(

0 commit comments

Comments
 (0)