diff options
| author | bors <bors@rust-lang.org> | 2023-03-03 19:57:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-03 19:57:10 +0000 |
| commit | 44cfafe2fafe816395d3acc434663a45d5178c41 (patch) | |
| tree | 7752d393b7fac05f43f2cca290838a22987d4b7f /compiler/rustc_parse/src/parser | |
| parent | 7a809ce8997a1697b166b4bb2594993e87d69f31 (diff) | |
| parent | 01fc5a765353741ee0a2597bd48283368253e9b6 (diff) | |
| download | rust-44cfafe2fafe816395d3acc434663a45d5178c41.tar.gz rust-44cfafe2fafe816395d3acc434663a45d5178c41.zip | |
Auto merge of #108707 - matthiaskrgr:rollup-9a2l6pc, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #107981 (new solver: implement canonicalization and region constraints) - #108553 (Deny capturing late-bound non-lifetime param in anon const) - #108599 (Remove legacy PM leftovers) - #108667 (Fix another ICE in `point_at_expr_source_of_inferred_type`) - #108674 (Clippy Fix array-size-threshold config deserialization error) - #108685 (Match unmatched backticks in compiler/) - #108694 (Match unmatched backticks in compiler/ comments) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src/parser')
| -rw-r--r-- | compiler/rustc_parse/src/parser/attr_wrapper.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_parse/src/parser/mod.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_parse/src/parser/attr_wrapper.rs b/compiler/rustc_parse/src/parser/attr_wrapper.rs index dbd3b76786f..b0ab0f10624 100644 --- a/compiler/rustc_parse/src/parser/attr_wrapper.rs +++ b/compiler/rustc_parse/src/parser/attr_wrapper.rs @@ -134,11 +134,11 @@ impl ToAttrTokenStream for LazyAttrTokenStreamImpl { // Process the replace ranges, starting from the highest start // position and working our way back. If have tokens like: // - // `#[cfg(FALSE)]` struct Foo { #[cfg(FALSE)] field: bool }` + // `#[cfg(FALSE)] struct Foo { #[cfg(FALSE)] field: bool }` // // Then we will generate replace ranges for both // the `#[cfg(FALSE)] field: bool` and the entire - // `#[cfg(FALSE)]` struct Foo { #[cfg(FALSE)] field: bool }` + // `#[cfg(FALSE)] struct Foo { #[cfg(FALSE)] field: bool }` // // By starting processing from the replace range with the greatest // start position, we ensure that any replace range which encloses diff --git a/compiler/rustc_parse/src/parser/mod.rs b/compiler/rustc_parse/src/parser/mod.rs index b1b79fe4e05..da82e4724d1 100644 --- a/compiler/rustc_parse/src/parser/mod.rs +++ b/compiler/rustc_parse/src/parser/mod.rs @@ -335,7 +335,7 @@ impl TokenCursor { num_of_hashes = cmp::max(num_of_hashes, count); } - // `/// foo` becomes `doc = r"foo". + // `/// foo` becomes `doc = r"foo"`. let delim_span = DelimSpan::from_single(span); let body = TokenTree::Delimited( delim_span, |