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 40d7efa

Browse files
committedNov 29, 2020
Auto merge of #79529 - Dylan-DPC:rollup-6k20msr, r=Dylan-DPC
Rollup of 11 pull requests Successful merges: - #79327 (Require allocator to be static for boxed `Pin`-API) - #79340 (Rename "stability" CSS class to "item-info" and combine `document_stability` with `document_short`) - #79363 (BTreeMap: try to enhance various comments) - #79395 (Move ui if tests from top-level into `expr/if`) - #79443 (Improve rustdoc JS tests error output) - #79464 (Extend doc keyword feature by allowing any ident) - #79484 (add enable-full-tools to freebsd builds to prevent occasional link er…) - #79505 (Cleanup: shorter and faster code) - #79514 (Add test for issue #54121: order dependent trait bounds) - #79516 (Remove unnecessary `mut` binding) - #79528 (Fix a bootstrap comment) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 914d07a + d0515ce commit 40d7efa

File tree

73 files changed

+343
-171
lines changed

Some content is hidden

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

73 files changed

+343
-171
lines changed
 

‎compiler/rustc_lint/src/nonstandard_style.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ fn to_camel_case(s: &str) -> String {
9494
}
9595

9696
if new_word {
97-
camel_cased_component.push_str(&c.to_uppercase().to_string());
97+
camel_cased_component.extend(c.to_uppercase());
9898
} else {
99-
camel_cased_component.push_str(&c.to_lowercase().to_string());
99+
camel_cased_component.extend(c.to_lowercase());
100100
}
101101

102102
prev_is_lower_case = c.is_lowercase();

‎compiler/rustc_span/src/symbol.rs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,11 +1590,6 @@ impl Symbol {
15901590
self == kw::Try
15911591
}
15921592

1593-
/// Used for sanity checking rustdoc keyword sections.
1594-
pub fn is_doc_keyword(self) -> bool {
1595-
self <= kw::Union
1596-
}
1597-
15981593
/// A keyword or reserved identifier that can be used as a path segment.
15991594
pub fn is_path_segment_keyword(self) -> bool {
16001595
self == kw::Super

0 commit comments

Comments
 (0)
Please sign in to comment.