Skip to content

Commit 6ed6f14

Browse files
committedApr 17, 2019
Auto merge of #60034 - rasendubi:fix-comments, r=Centril
Small comments fix - Fix comments around test harness generation - Promote regular comments to rustdoc comments
2 parents efe2f32 + 56c0125 commit 6ed6f14

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed
 

‎src/librustc_errors/lib.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -304,17 +304,17 @@ pub struct Handler {
304304
continue_after_error: AtomicBool,
305305
delayed_span_bugs: Lock<Vec<Diagnostic>>,
306306

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

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

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

‎src/librustc_macros/src/query.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ enum QueryModifier {
5555
/// Generate a dep node based on the dependencies of the query
5656
Anon,
5757

58-
// Always evaluate the query, ignoring its depdendencies
58+
/// Always evaluate the query, ignoring its depdendencies
5959
EvalAlways,
6060
}
6161

‎src/libsyntax/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ fn mk_main(cx: &mut TestCtxt<'_>) -> P<ast::Item> {
327327
// Writing this out by hand with 'ignored_span':
328328
// pub fn main() {
329329
// #![main]
330-
// test::test_main_static(::std::os::args().as_slice(), &[..tests]);
330+
// test::test_main_static(&[..tests]);
331331
// }
332332
let sp = ignored_span(cx, DUMMY_SP);
333333
let ecx = &cx.ext_cx;

‎src/libsyntax_ext/test.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ pub fn expand_test_or_bench(
8686
cx.path(sp, vec![test_id, cx.ident_of(name)])
8787
};
8888

89-
// creates test::$name
89+
// creates test::ShouldPanic::$name
9090
let should_panic_path = |name| {
9191
cx.path(sp, vec![test_id, cx.ident_of("ShouldPanic"), cx.ident_of(name)])
9292
};

0 commit comments

Comments
 (0)