mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make get_highlight_region_for_regionvid only affect re-vid

Browse Source 
In NLL, ReVid is all there is, but I might want to repurpose.
This commit is contained in:
Niko Matsakis 2018-11-16 19:13:55 -05:00
parent 0b03b9bbcf
commit 995192a472
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/librustc/util/ppaux.rs
View File

@ -771,7 +771,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
define_print! {
() ty::RegionKind, (self, f, cx) {
display {
if cx.is_verbose || get_highlight_region_for_regionvid().is_some() {
if cx.is_verbose {
return self.print_debug(f, cx);
}
@ -806,11 +806,16 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
),
}
}
ty::ReVar(region_vid) if cx.identify_regions => {
write!(f, "'{}rv", region_vid.index())
ty::ReVar(region_vid) => {
if get_highlight_region_for_regionvid().is_some() {
write!(f, "{:?}", region_vid)
} else if cx.identify_regions {
write!(f, "'{}rv", region_vid.index())
} else {
Ok(())
}
}
ty::ReScope(_) |
ty::ReVar(_) |
ty::ReErased => Ok(()),
ty::ReStatic => write!(f, "'static"),
ty::ReEmpty => write!(f, "'<empty>"),