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 e605a88

Browse files
committedJun 24, 2022
Auto merge of rust-lang#98438 - compiler-errors:rollup-fudubjn, r=compiler-errors
Rollup of 16 pull requests Successful merges: - rust-lang#96173 (Fix documentation for `with_capacity` and `reserve` families of methods) - rust-lang#98184 (Give name if anonymous region appears in impl signature) - rust-lang#98259 (Greatly improve error reporting for futures and generators in `note_obligation_cause_code`) - rust-lang#98269 (Provide a `PathSegment.res` in more cases) - rust-lang#98283 (Point at private fields in struct literal) - rust-lang#98305 (prohibit_generics: don't alloc error string if no error emitted) - rust-lang#98310 (rustdoc: optimize loading of source sidebar) - rust-lang#98353 (Migrate two diagnostics from the `rustc_builtin_macros` crate) - rust-lang#98355 (Update no_default_libraries handling for emscripten target) - rust-lang#98364 (clarify Arc::clone overflow check comment) - rust-lang#98365 (Address review comments from rust-lang#98259) - rust-lang#98388 (implement `iter_projections` function on `PlaceRef`) - rust-lang#98390 (Fixes handling of keywords in rustdoc json output) - rust-lang#98409 (triagebot.toml: Allow applying nominated labels) - rust-lang#98410 (Update books) - rust-lang#98422 (Update browser-ui-test version to 0.9.6) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4334739 + c9b1674 commit e605a88

File tree

87 files changed

+1119
-436
lines changed

Some content is hidden

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

87 files changed

+1119
-436
lines changed
 

‎Cargo.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3669,6 +3669,7 @@ dependencies = [
36693669
"rustc_feature",
36703670
"rustc_lexer",
36713671
"rustc_lint_defs",
3672+
"rustc_macros",
36723673
"rustc_parse",
36733674
"rustc_parse_format",
36743675
"rustc_session",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ impl OutlivesSuggestionBuilder {
6262
| RegionNameSource::AnonRegionFromUpvar(..)
6363
| RegionNameSource::AnonRegionFromOutput(..)
6464
| RegionNameSource::AnonRegionFromYieldTy(..)
65-
| RegionNameSource::AnonRegionFromAsyncFn(..) => {
65+
| RegionNameSource::AnonRegionFromAsyncFn(..)
66+
| RegionNameSource::AnonRegionFromImplSignature(..) => {
6667
debug!("Region {:?} is NOT suggestable", name);
6768
false
6869
}

0 commit comments

Comments
 (0)
Please sign in to comment.