nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-20 04:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

normalize use of backticks in compiler messages for librustc_incremental

Browse Source 
https://github.com/rust-lang/rust/issues/60532
This commit is contained in:
Samy Kacimi 2019-07-20 18:49:34 +02:00
parent 95b1fe560d
commit 60ca55cbda
No known key found for this signature in database
GPG Key ID: E2294E922F4C56E5
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc_incremental/assert_dep_graph.rs
View File

@ -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 { for &(target_span, _, _, _) in then_this_would_need {
tcx.sess.span_err( tcx.sess.span_err(
target_span, target_span,
"no #[rustc_if_this_changed] annotation detected"); "no `#[rustc_if_this_changed]` annotation detected");
} }
return; return;

2
src/librustc_incremental/persist/dirty_clean.rs
View File

@ -610,7 +610,7 @@ impl FindAllAttrs<'tcx> {
for attr in &self.found_attrs { for attr in &self.found_attrs {
if !checked_attrs.contains(&attr.id) { if !checked_attrs.contains(&attr.id) {
self.tcx.sess.span_err(attr.span, &format!("found unchecked \ self.tcx.sess.span_err(attr.span, &format!("found unchecked \
#[rustc_dirty]/#[rustc_clean] attribute")); `#[rustc_dirty]` / `#[rustc_clean]` attribute"));
} }
} }
} }

6
src/librustc_incremental/persist/fs.rs
View File

@ -538,7 +538,7 @@ fn find_source_directory_in_iter<I>(iter: I,
if source_directories_already_tried.contains(&session_dir) || if source_directories_already_tried.contains(&session_dir) ||
!is_session_directory(&directory_name) || !is_session_directory(&directory_name) ||
!is_finalized(&directory_name) { !is_finalized(&directory_name) {
debug!("find_source_directory_in_iter - ignoring."); debug!("find_source_directory_in_iter - ignoring");
continue 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) { let timestamp = match extract_timestamp_from_session_dir(lock_file_name) {
Ok(timestamp) => timestamp, Ok(timestamp) => timestamp,
Err(()) => { Err(()) => {
debug!("Found lock-file with malformed timestamp: {}", debug!("found lock-file with malformed timestamp: {}",
crate_directory.join(&lock_file_name).display()); crate_directory.join(&lock_file_name).display());
// Ignore it // Ignore it
continue 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) { let timestamp = match extract_timestamp_from_session_dir(directory_name) {
Ok(timestamp) => timestamp, Ok(timestamp) => timestamp,
Err(()) => { Err(()) => {
debug!("Found session-dir with malformed timestamp: {}", debug!("found session-dir with malformed timestamp: {}",
crate_directory.join(directory_name).display()); crate_directory.join(directory_name).display());
// Ignore it // Ignore it
continue continue

8
src/test/incremental/unchecked_dirty_clean.rs
View File

@ -11,13 +11,13 @@
fn main() { fn main() {
#[rustc_dirty(label="Hir", cfg="cfail2")] #[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 // empty block
} }
#[rustc_clean(label="Hir", cfg="cfail2")] #[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 // empty block
} }
@ -25,10 +25,10 @@ fn main() {
struct _Struct { struct _Struct {
#[rustc_dirty(label="Hir", cfg="cfail2")] #[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, _field1: i32,
#[rustc_clean(label="Hir", cfg="cfail2")] #[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, _field2: i32,
} }