Skip to content

Commit e183c2b

Browse files
committed
Auto merge of #98307 - matthiaskrgr:rollup-rb3huha, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #98235 (Drop magic value 3 from code) - #98267 (Don't omit comma when suggesting wildcard arm after macro expr) - #98276 (Mention formatting macros when encountering `ArgumentV1` method in const) - #98296 (Add a link to the unstable book page on Generator doc comment) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents a8376d9 + 0687623 commit e183c2b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

core/src/fmt/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ macro_rules! arg_new {
320320
};
321321
}
322322

323+
#[rustc_diagnostic_item = "ArgumentV1Methods"]
323324
impl<'a> ArgumentV1<'a> {
324325
#[doc(hidden)]
325326
#[unstable(feature = "fmt_internals", reason = "internal to format_args!", issue = "none")]

core/src/ops/generator.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,10 @@ pub enum GeneratorState<Y, R> {
6161
/// }
6262
/// ```
6363
///
64-
/// More documentation of generators can be found in the unstable book.
64+
/// More documentation of generators can be found in the [unstable book].
6565
///
6666
/// [RFC 2033]: https://github.com/rust-lang/rfcs/pull/2033
67+
/// [unstable book]: ../../unstable-book/language-features/generators.html
6768
#[lang = "generator"]
6869
#[unstable(feature = "generator_trait", issue = "43122")]
6970
#[fundamental]

0 commit comments

Comments
 (0)