Skip to content

Commit

Permalink
normalize use of backticks in compiler messages for librustc_incremental
Browse files Browse the repository at this point in the history
  • Loading branch information
Samy Kacimi committed Jul 20, 2019
1 parent 95b1fe5 commit 60ca55c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/librustc_incremental/assert_dep_graph.rs
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ fn check_paths<'tcx>(tcx: TyCtxt<'tcx>, if_this_changed: &Sources, then_this_wou
for &(target_span, _, _, _) in then_this_would_need {
tcx.sess.span_err(
target_span,
"no #[rustc_if_this_changed] annotation detected");
"no `#[rustc_if_this_changed]` annotation detected");

}
return;
Expand Down
2 changes: 1 addition & 1 deletion src/librustc_incremental/persist/dirty_clean.rs
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ impl FindAllAttrs<'tcx> {
for attr in &self.found_attrs {
if !checked_attrs.contains(&attr.id) {
self.tcx.sess.span_err(attr.span, &format!("found unchecked \
#[rustc_dirty]/#[rustc_clean] attribute"));
`#[rustc_dirty]` / `#[rustc_clean]` attribute"));
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/librustc_incremental/persist/fs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ fn find_source_directory_in_iter<I>(iter: I,
if source_directories_already_tried.contains(&session_dir) ||
!is_session_directory(&directory_name) ||
!is_finalized(&directory_name) {
debug!("find_source_directory_in_iter - ignoring.");
debug!("find_source_directory_in_iter - ignoring");
continue
}

Expand Down Expand Up @@ -693,7 +693,7 @@ pub fn garbage_collect_session_directories(sess: &Session) -> io::Result<()> {
let timestamp = match extract_timestamp_from_session_dir(lock_file_name) {
Ok(timestamp) => timestamp,
Err(()) => {
debug!("Found lock-file with malformed timestamp: {}",
debug!("found lock-file with malformed timestamp: {}",
crate_directory.join(&lock_file_name).display());
// Ignore it
continue
Expand Down Expand Up @@ -746,7 +746,7 @@ pub fn garbage_collect_session_directories(sess: &Session) -> io::Result<()> {
let timestamp = match extract_timestamp_from_session_dir(directory_name) {
Ok(timestamp) => timestamp,
Err(()) => {
debug!("Found session-dir with malformed timestamp: {}",
debug!("found session-dir with malformed timestamp: {}",
crate_directory.join(directory_name).display());
// Ignore it
continue
Expand Down
8 changes: 4 additions & 4 deletions src/test/incremental/unchecked_dirty_clean.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@
fn main() {

#[rustc_dirty(label="Hir", cfg="cfail2")]
//[cfail2]~^ ERROR found unchecked #[rustc_dirty]/#[rustc_clean] attribute
//[cfail2]~^ ERROR found unchecked `#[rustc_dirty]` / `#[rustc_clean]` attribute
{
// empty block
}

#[rustc_clean(label="Hir", cfg="cfail2")]
//[cfail2]~^ ERROR found unchecked #[rustc_dirty]/#[rustc_clean] attribute
//[cfail2]~^ ERROR found unchecked `#[rustc_dirty]` / `#[rustc_clean]` attribute
{
// empty block
}
}

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

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

0 comments on commit 60ca55c

Please sign in to comment.