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 2643b16

Browse files
committedJul 27, 2022
Auto merge of #99816 - GuillaumeGomez:rollup-tyobksa, r=GuillaumeGomez
Rollup of 7 pull requests Successful merges: - #94247 (Fix slice::ChunksMut aliasing) - #99358 (Allow `ValTree::try_to_raw_bytes` on `u8` array) - #99651 (Deeply deny fn and raw ptrs in const generics) - #99710 (lint: add bad opt access internal lint) - #99717 (Add some comments to the docs issue template to clarify) - #99728 (Clean up HIR-based lifetime resolution) - #99812 (Fix headings colors) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents da5b546 + 2d52aa0 commit 2643b16

File tree

66 files changed

+1570
-1350
lines changed

Some content is hidden

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

66 files changed

+1570
-1350
lines changed
 

‎.github/ISSUE_TEMPLATE/documentation.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,28 @@ about: Create a report for a documentation problem.
44
labels: A-docs
55
---
66
<!--
7+
78
Thank you for finding a documentation problem! 📚
89
910
Documentation problems might be grammatical issues, typos, or unclear wording, please provide details regarding the documentation including where it is present.
1011
12+
Note: If your issue is for one of these, please use their dedicated issue tracker instead:
13+
14+
- The Rust Book: https://github.com/rust-lang/book/issues
15+
- Rust by Example: https://github.com/rust-lang/rust-by-example/issues
16+
- The Edition Guide: https://github.com/rust-lang/edition-guide/issues
17+
- The Cargo Book: https://github.com/rust-lang/cargo/issues
18+
- The Clippy Book: https://github.com/rust-lang/rust-clippy/issues
19+
- The Reference: https://github.com/rust-lang/reference/issues
20+
- The Rustonomicon: https://github.com/rust-lang/nomicon/issues
21+
- The Embedded Book: https://github.com/rust-embedded/book/issues
22+
23+
All other documentation issues should be filed here.
24+
25+
Or, if you find an issue related to rustdoc (e.g. doctest, rustdoc UI), please use the bug report or blank issue template instead.
26+
1127
-->
1228

1329
### Location
1430

1531
### Summary
16-

‎compiler/rustc_ast_lowering/src/lib.rs

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1883,29 +1883,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
18831883
}
18841884
hir::LifetimeName::Param(param, ParamName::Fresh)
18851885
}
1886-
LifetimeRes::Anonymous { binder, elided } => {
1887-
let mut l_name = None;
1888-
if let Some(mut captured_lifetimes) = self.captured_lifetimes.take() {
1889-
if !captured_lifetimes.binders_to_ignore.contains(&binder) {
1890-
let p_id = self.next_node_id();
1891-
let p_def_id = self.create_def(
1892-
captured_lifetimes.parent_def_id,
1893-
p_id,
1894-
DefPathData::LifetimeNs(kw::UnderscoreLifetime),
1895-
);
1896-
captured_lifetimes
1897-
.captures
1898-
.insert(p_def_id, (span, p_id, ParamName::Fresh, res));
1899-
l_name = Some(hir::LifetimeName::Param(p_def_id, ParamName::Fresh));
1900-
}
1901-
self.captured_lifetimes = Some(captured_lifetimes);
1902-
};
1903-
l_name.unwrap_or(if elided {
1904-
hir::LifetimeName::Implicit
1905-
} else {
1906-
hir::LifetimeName::Underscore
1907-
})
1908-
}
1886+
LifetimeRes::Infer => hir::LifetimeName::Infer,
19091887
LifetimeRes::Static => hir::LifetimeName::Static,
19101888
LifetimeRes::Error => hir::LifetimeName::Error,
19111889
res => panic!("Unexpected lifetime resolution {:?} for {:?} at {:?}", res, ident, span),

0 commit comments

Comments
 (0)
Please sign in to comment.