Skip to content

Commit 6558b98

Browse files
authored
Rollup merge of #62832 - fakenine:normalize_use_of_backticks_compiler_messages_p12, r=Centril
normalize use of backticks in compiler messages for librustc_incremental #60532
2 parents b7d136f + 60ca55c commit 6558b98

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

src/librustc_incremental/assert_dep_graph.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ fn check_paths<'tcx>(tcx: TyCtxt<'tcx>, if_this_changed: &Sources, then_this_wou
190190
for &(target_span, _, _, _) in then_this_would_need {
191191
tcx.sess.span_err(
192192
target_span,
193-
"no #[rustc_if_this_changed] annotation detected");
193+
"no `#[rustc_if_this_changed]` annotation detected");
194194

195195
}
196196
return;

src/librustc_incremental/persist/dirty_clean.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ impl FindAllAttrs<'tcx> {
610610
for attr in &self.found_attrs {
611611
if !checked_attrs.contains(&attr.id) {
612612
self.tcx.sess.span_err(attr.span, &format!("found unchecked \
613-
#[rustc_dirty]/#[rustc_clean] attribute"));
613+
`#[rustc_dirty]` / `#[rustc_clean]` attribute"));
614614
}
615615
}
616616
}

src/librustc_incremental/persist/fs.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -538,7 +538,7 @@ fn find_source_directory_in_iter<I>(iter: I,
538538
if source_directories_already_tried.contains(&session_dir) ||
539539
!is_session_directory(&directory_name) ||
540540
!is_finalized(&directory_name) {
541-
debug!("find_source_directory_in_iter - ignoring.");
541+
debug!("find_source_directory_in_iter - ignoring");
542542
continue
543543
}
544544

@@ -693,7 +693,7 @@ pub fn garbage_collect_session_directories(sess: &Session) -> io::Result<()> {
693693
let timestamp = match extract_timestamp_from_session_dir(lock_file_name) {
694694
Ok(timestamp) => timestamp,
695695
Err(()) => {
696-
debug!("Found lock-file with malformed timestamp: {}",
696+
debug!("found lock-file with malformed timestamp: {}",
697697
crate_directory.join(&lock_file_name).display());
698698
// Ignore it
699699
continue
@@ -746,7 +746,7 @@ pub fn garbage_collect_session_directories(sess: &Session) -> io::Result<()> {
746746
let timestamp = match extract_timestamp_from_session_dir(directory_name) {
747747
Ok(timestamp) => timestamp,
748748
Err(()) => {
749-
debug!("Found session-dir with malformed timestamp: {}",
749+
debug!("found session-dir with malformed timestamp: {}",
750750
crate_directory.join(directory_name).display());
751751
// Ignore it
752752
continue

src/test/incremental/unchecked_dirty_clean.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,24 @@
1111
fn main() {
1212

1313
#[rustc_dirty(label="Hir", cfg="cfail2")]
14-
//[cfail2]~^ ERROR found unchecked #[rustc_dirty]/#[rustc_clean] attribute
14+
//[cfail2]~^ ERROR found unchecked `#[rustc_dirty]` / `#[rustc_clean]` attribute
1515
{
1616
// empty block
1717
}
1818

1919
#[rustc_clean(label="Hir", cfg="cfail2")]
20-
//[cfail2]~^ ERROR found unchecked #[rustc_dirty]/#[rustc_clean] attribute
20+
//[cfail2]~^ ERROR found unchecked `#[rustc_dirty]` / `#[rustc_clean]` attribute
2121
{
2222
// empty block
2323
}
2424
}
2525

2626
struct _Struct {
2727
#[rustc_dirty(label="Hir", cfg="cfail2")]
28-
//[cfail2]~^ ERROR found unchecked #[rustc_dirty]/#[rustc_clean] attribute
28+
//[cfail2]~^ ERROR found unchecked `#[rustc_dirty]` / `#[rustc_clean]` attribute
2929
_field1: i32,
3030

3131
#[rustc_clean(label="Hir", cfg="cfail2")]
32-
//[cfail2]~^ ERROR found unchecked #[rustc_dirty]/#[rustc_clean] attribute
32+
//[cfail2]~^ ERROR found unchecked `#[rustc_dirty]` / `#[rustc_clean]` attribute
3333
_field2: i32,
3434
}

0 commit comments

Comments
 (0)