07e7823c01
If a symbol name can only be imported from one place for a type, and as long as it was not glob-imported anywhere in the current crate, we can trim its printed path and print only the name. This has wide implications on error messages with types, for example, shortening `std::vec::Vec` to just `Vec`, as long as there is no other `Vec` importable anywhere. This adds a new '-Z trim-diagnostic-paths=false' option to control this feature. On the good path, with no diagnosis printed, we should try to avoid issuing this query, so we need to prevent trimmed_def_paths query on several cases. This change also relies on a previous commit that differentiates between `Debug` and `Display` on various rustc types, where the latter is trimmed and presented to the user and the former is not.
40 lines
733 B
Rust
40 lines
733 B
Rust
// revisions: rpass1 cfail2
|
|
// compile-flags: -Z query-dep-graph
|
|
|
|
#![allow(warnings)]
|
|
#![feature(rustc_attrs)]
|
|
|
|
// Sanity check for the dirty-clean system. Give the opposite
|
|
// annotations that we expect to see, so that we check that errors are
|
|
// reported.
|
|
|
|
fn main() { }
|
|
|
|
mod x {
|
|
#[cfg(rpass1)]
|
|
pub fn x() -> usize {
|
|
22
|
|
}
|
|
|
|
#[cfg(cfail2)]
|
|
pub fn x() -> u32 {
|
|
22
|
|
}
|
|
}
|
|
|
|
mod y {
|
|
use x;
|
|
|
|
#[rustc_clean(label="typeck", cfg="cfail2")]
|
|
pub fn y() {
|
|
//[cfail2]~^ ERROR `typeck(y)` should be clean but is not
|
|
x::x();
|
|
}
|
|
}
|
|
|
|
mod z {
|
|
#[rustc_dirty(label="typeck", cfg="cfail2")]
|
|
pub fn z() {
|
|
//[cfail2]~^ ERROR `typeck(z)` should be dirty but is not
|
|
}
|
|
}
|