diff options
| author | Samy Kacimi <samy.kacimi@protonmail.ch> | 2019-07-20 18:49:34 +0200 |
|---|---|---|
| committer | Samy Kacimi <samy.kacimi@protonmail.ch> | 2019-07-20 20:57:45 +0200 |
| commit | 60ca55cbdaaea86efb06ec5346f65bfa15552be8 (patch) | |
| tree | 860541c5df5dc10ff882b126a0eba86ae3d7bf04 /src | |
| parent | 95b1fe560d2bd8472f250fb8cfd2168520a58405 (diff) | |
| download | rust-60ca55cbdaaea86efb06ec5346f65bfa15552be8.tar.gz rust-60ca55cbdaaea86efb06ec5346f65bfa15552be8.zip | |
normalize use of backticks in compiler messages for librustc_incremental
https://github.com/rust-lang/rust/issues/60532
Diffstat (limited to 'src')
| -rw-r--r-- | src/librustc_incremental/assert_dep_graph.rs | 2 | ||||
| -rw-r--r-- | src/librustc_incremental/persist/dirty_clean.rs | 2 | ||||
| -rw-r--r-- | src/librustc_incremental/persist/fs.rs | 6 | ||||
| -rw-r--r-- | src/test/incremental/unchecked_dirty_clean.rs | 8 |
4 files changed, 9 insertions, 9 deletions
diff --git a/src/librustc_incremental/assert_dep_graph.rs b/src/librustc_incremental/assert_dep_graph.rs index ba893f5f936..07d426af6ee 100644 --- a/src/librustc_incremental/assert_dep_graph.rs +++ b/src/librustc_incremental/assert_dep_graph.rs @@ -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; diff --git a/src/librustc_incremental/persist/dirty_clean.rs b/src/librustc_incremental/persist/dirty_clean.rs index c23bb6b47f4..aa98ebae543 100644 --- a/src/librustc_incremental/persist/dirty_clean.rs +++ b/src/librustc_incremental/persist/dirty_clean.rs @@ -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")); } } } diff --git a/src/librustc_incremental/persist/fs.rs b/src/librustc_incremental/persist/fs.rs index 7f697b54484..0ab67af613b 100644 --- a/src/librustc_incremental/persist/fs.rs +++ b/src/librustc_incremental/persist/fs.rs @@ -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 } @@ -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 @@ -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 diff --git a/src/test/incremental/unchecked_dirty_clean.rs b/src/test/incremental/unchecked_dirty_clean.rs index 9ea9431e20a..66bdb670167 100644 --- a/src/test/incremental/unchecked_dirty_clean.rs +++ b/src/test/incremental/unchecked_dirty_clean.rs @@ -11,13 +11,13 @@ 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 } @@ -25,10 +25,10 @@ fn main() { 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, } |
