diff options
| author | bors <bors@rust-lang.org> | 2021-01-07 18:20:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-01-07 18:20:12 +0000 |
| commit | c8915eebeaaef9f7cc1cff6ffd97f578b03c2ac9 (patch) | |
| tree | 4f7d314db8e68283fb153059aa2d18a6cf0b3a95 /library | |
| parent | 8f0b945cfcc3d084583bc27a7ed23b27b1246751 (diff) | |
| parent | 695f878332e9b6fb4900642eda036b8578588a56 (diff) | |
| download | rust-c8915eebeaaef9f7cc1cff6ffd97f578b03c2ac9.tar.gz rust-c8915eebeaaef9f7cc1cff6ffd97f578b03c2ac9.zip | |
Auto merge of #80790 - JohnTitor:rollup-js1noez, r=JohnTitor
Rollup of 10 pull requests Successful merges: - #80012 (Add pointing const identifier when emitting E0435) - #80521 (MIR Inline is incompatible with coverage) - #80659 (Edit rustc_ast::tokenstream docs) - #80660 (Properly handle primitive disambiguators in rustdoc) - #80738 (Remove bottom margin from crate version when the docs sidebar is collapsed) - #80744 (rustdoc: Turn `next_def_id` comments into docs) - #80750 (Don't use to_string on Symbol in rustc_passes/check_attr.rs) - #80769 (Improve wording of parse doc) - #80780 (Return EOF_CHAR constant instead of magic char.) - #80784 (rustc_parse: Better spans for synthesized token streams) Failed merges: - #80785 (rustc_ast_pretty: Remove `PrintState::insert_extra_parens`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library')
| -rw-r--r-- | library/core/src/str/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/core/src/str/mod.rs b/library/core/src/str/mod.rs index ba495a1a9fb..ae7892291ed 100644 --- a/library/core/src/str/mod.rs +++ b/library/core/src/str/mod.rs @@ -2175,7 +2175,7 @@ impl str { /// helps the inference algorithm understand specifically which type /// you're trying to parse into. /// - /// `parse` can parse any type that implements the [`FromStr`] trait. + /// `parse` can parse into any type that implements the [`FromStr`] trait. /// /// # Errors |