Skip to content

Commit

Permalink
Auto merge of #60034 - rasendubi:fix-comments, r=Centril
Browse files Browse the repository at this point in the history
Small comments fix

- Fix comments around test harness generation
- Promote regular comments to rustdoc comments
  • Loading branch information
bors committed Apr 17, 2019
2 parents efe2f32 + 56c0125 commit 6ed6f14
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions src/librustc_errors/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -304,17 +304,17 @@ pub struct Handler {
continue_after_error: AtomicBool,
delayed_span_bugs: Lock<Vec<Diagnostic>>,

// This set contains the `DiagnosticId` of all emitted diagnostics to avoid
// emitting the same diagnostic with extended help (`--teach`) twice, which
// would be uneccessary repetition.
/// This set contains the `DiagnosticId` of all emitted diagnostics to avoid
/// emitting the same diagnostic with extended help (`--teach`) twice, which
/// would be uneccessary repetition.
taught_diagnostics: Lock<FxHashSet<DiagnosticId>>,

/// Used to suggest rustc --explain <error code>
emitted_diagnostic_codes: Lock<FxHashSet<DiagnosticId>>,

// This set contains a hash of every diagnostic that has been emitted by
// this handler. These hashes is used to avoid emitting the same error
// twice.
/// This set contains a hash of every diagnostic that has been emitted by
/// this handler. These hashes is used to avoid emitting the same error
/// twice.
emitted_diagnostics: Lock<FxHashSet<u128>>,
}

Expand Down
2 changes: 1 addition & 1 deletion src/librustc_macros/src/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ enum QueryModifier {
/// Generate a dep node based on the dependencies of the query
Anon,

// Always evaluate the query, ignoring its depdendencies
/// Always evaluate the query, ignoring its depdendencies
EvalAlways,
}

Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ fn mk_main(cx: &mut TestCtxt<'_>) -> P<ast::Item> {
// Writing this out by hand with 'ignored_span':
// pub fn main() {
// #![main]
// test::test_main_static(::std::os::args().as_slice(), &[..tests]);
// test::test_main_static(&[..tests]);
// }
let sp = ignored_span(cx, DUMMY_SP);
let ecx = &cx.ext_cx;
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax_ext/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ pub fn expand_test_or_bench(
cx.path(sp, vec![test_id, cx.ident_of(name)])
};

// creates test::$name
// creates test::ShouldPanic::$name
let should_panic_path = |name| {
cx.path(sp, vec![test_id, cx.ident_of("ShouldPanic"), cx.ident_of(name)])
};
Expand Down

0 comments on commit 6ed6f14

Please sign in to comment.