Skip to content

Commit 0e5c95e

Browse files
mikhail-m1mikhail-m1
committed
change separator from . to - 
1 parent 7a6832d commit 0e5c95e

File tree

10 files changed

+28
-24
lines changed

10 files changed

+28
-24
lines changed

‎src/librustc/hir/map/definitions.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -321,12 +321,15 @@ impl DefPath {
321321
pub fn to_filename_friendly_no_crate(&self) -> String {
322322
let mut s = String::with_capacity(self.data.len() * 16);
323323

324+
let mut opt_delimiter = None;
324325
for component in &self.data {
326+
opt_delimiter.map(|d| s.push(d));
327+
opt_delimiter = Some('-');
325328
if component.disambiguator == 0 {
326-
write!(s, ".{}", component.data.as_interned_str()).unwrap();
329+
write!(s, "{}", component.data.as_interned_str()).unwrap();
327330
} else {
328331
write!(s,
329-
".{}[{}]",
332+
"{}[{}]",
330333
component.data.as_interned_str(),
331334
component.disambiguator)
332335
.unwrap();

‎src/librustc_mir/util/pretty.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,9 @@ where
135135

136136
let _ = fs::create_dir_all(&file_path);
137137
let function_name = tcx.hir.def_path_from_id(source.item_id())
138-
.map(|d| d.to_filename_friendly_no_crate()) .unwrap_or(format!(".node{}", source.item_id()));
139-
let file_name = format!("rustc{}{}{}.{}.{}.mir",
138+
.map(|d| d.to_filename_friendly_no_crate())
139+
.unwrap_or(format!("node{}", source.item_id()));
140+
let file_name = format!("rustc.{}{}{}.{}.{}.mir",
140141
function_name, promotion_id, pass_num, pass_name, disambiguator);
141142
file_path.push(&file_name);
142143
let _ = fs::File::create(&file_path).and_then(|mut file| {

‎src/test/mir-opt/end_region_5.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
6666
// }
6767
// END rustc.main.SimplifyCfg-qualify-consts.after.mir
6868

69-
// START rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir
69+
// START rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir
7070
// fn main::{{closure}}(_1: [closure@NodeId(18) d:&'14s D]) -> i32 {
7171
// let mut _0: i32;
7272
// let mut _2: i32;
@@ -78,4 +78,4 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
7878
// StorageDead(_2);
7979
// return;
8080
// }
81-
// END rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir
81+
// END rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir

‎src/test/mir-opt/end_region_6.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
6464
// }
6565
// END rustc.main.SimplifyCfg-qualify-consts.after.mir
6666

67-
// START rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir
67+
// START rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir
6868
// fn main::{{closure}}(_1: [closure@NodeId(22) d:&'19s D]) -> i32 {
6969
// let mut _0: i32;
7070
// ...
@@ -82,4 +82,4 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
8282
// StorageDead(_2);
8383
// return;
8484
// }
85-
// END rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir
85+
// END rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir

‎src/test/mir-opt/end_region_7.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
7272
// }
7373
// END rustc.main.SimplifyCfg-qualify-consts.after.mir
7474

75-
// START rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir
75+
// START rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir
7676
// fn main::{{closure}}(_1: [closure@NodeId(22) d:D]) -> i32 {
7777
// let mut _0: i32;
7878
// ...
@@ -94,4 +94,4 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
9494
// return;
9595
// }
9696
// }
97-
// END rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir
97+
// END rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir

‎src/test/mir-opt/end_region_8.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
7171
// }
7272
// END rustc.main.SimplifyCfg-qualify-consts.after.mir
7373

74-
// START rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir
74+
// START rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir
7575
// fn main::{{closure}}(_1: [closure@NodeId(22) r:&'21_1rs D]) -> i32 {
7676
// let mut _0: i32;
7777
// let mut _2: i32;
@@ -84,4 +84,4 @@ fn foo<F>(f: F) where F: FnOnce() -> i32 {
8484
// return;
8585
// }
8686
// }
87-
// END rustc.main.{{closure}}.SimplifyCfg-qualify-consts.after.mir
87+
// END rustc.main-{{closure}}.SimplifyCfg-qualify-consts.after.mir

‎src/test/mir-opt/nll/named-lifetimes-basic.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ fn main() {
2525
}
2626

2727
// END RUST SOURCE
28-
// START rustc.node4.nll.0.mir
28+
// START rustc.use_x.nll.0.mir
2929
// | '_#0r: {bb0[0], bb0[1], '_#0r}
3030
// | '_#1r: {bb0[0], bb0[1], '_#0r, '_#1r}
3131
// | '_#2r: {bb0[0], bb0[1], '_#2r}
3232
// ...
3333
// fn use_x(_1: &'_#0r mut i32, _2: &'_#1r u32, _3: &'_#0r u32, _4: &'_#2r u32) -> bool {
34-
// END rustc.node4.nll.0.mir
34+
// END rustc.use_x.nll.0.mir

‎src/test/mir-opt/validate_1.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ fn main() {
2828
}
2929

3030
// END RUST SOURCE
31-
// START rustc.{{impl}}.foo.EraseRegions.after.mir
31+
// START rustc.{{impl}}-foo.EraseRegions.after.mir
3232
// bb0: {
3333
// Validate(Acquire, [_1: &ReFree(DefId { krate: CrateNum(0), index: DefIndex(0:5) => validate_1[317d]::{{impl}}[0]::foo[0] }, BrAnon(0)) Test, _2: &ReFree(DefId { krate: CrateNum(0), index: DefIndex(0:5) => validate_1[317d]::{{impl}}[0]::foo[0] }, BrAnon(1)) mut i32]);
3434
// ...
3535
// return;
3636
// }
37-
// END rustc.{{impl}}.foo.EraseRegions.after.mir
37+
// END rustc.{{impl}}-foo.EraseRegions.after.mir
3838
// START rustc.main.EraseRegions.after.mir
3939
// fn main() -> () {
4040
// ...
@@ -58,7 +58,7 @@ fn main() {
5858
// }
5959
// }
6060
// END rustc.main.EraseRegions.after.mir
61-
// START rustc.main.{{closure}}.EraseRegions.after.mir
61+
// START rustc.main-{{closure}}.EraseRegions.after.mir
6262
// fn main::{{closure}}(_1: &ReErased [closure@NodeId(50)], _2: &ReErased mut i32) -> i32 {
6363
// ...
6464
// bb0: {
@@ -76,4 +76,4 @@ fn main() {
7676
// return;
7777
// }
7878
// }
79-
// END rustc.main.{{closure}}.EraseRegions.after.mir
79+
// END rustc.main-{{closure}}.EraseRegions.after.mir

‎src/test/mir-opt/validate_4.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fn main() {
4747
// }
4848
// }
4949
// END rustc.write_42.EraseRegions.after.mir
50-
// START rustc.write_42.{{closure}}.EraseRegions.after.mir
50+
// START rustc.write_42-{{closure}}.EraseRegions.after.mir
5151
// fn write_42::{{closure}}(_1: &ReErased [closure@NodeId(22)], _2: *mut i32) -> () {
5252
// ...
5353
// bb0: {
@@ -57,7 +57,7 @@ fn main() {
5757
// return;
5858
// }
5959
// }
60-
// END rustc.write_42.{{closure}}.EraseRegions.after.mir
60+
// END rustc.write_42-{{closure}}.EraseRegions.after.mir
6161
// START rustc.test.EraseRegions.after.mir
6262
// fn test(_1: &ReErased mut i32) -> () {
6363
// ...
@@ -74,7 +74,7 @@ fn main() {
7474
// }
7575
// }
7676
// END rustc.test.EraseRegions.after.mir
77-
// START rustc.main.{{closure}}.EraseRegions.after.mir
77+
// START rustc.main-{{closure}}.EraseRegions.after.mir
7878
// fn main::{{closure}}(_1: &ReErased [closure@NodeId(60)], _2: &ReErased mut i32) -> bool {
7979
// ...
8080
// bb0: {
@@ -86,4 +86,4 @@ fn main() {
8686
// }
8787
// ...
8888
// }
89-
// END rustc.main.{{closure}}.EraseRegions.after.mir
89+
// END rustc.main-{{closure}}.EraseRegions.after.mir

‎src/test/mir-opt/validate_5.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn main() {
4545
// ...
4646
// }
4747
// END rustc.test.EraseRegions.after.mir
48-
// START rustc.main.{{closure}}.EraseRegions.after.mir
48+
// START rustc.main-{{closure}}.EraseRegions.after.mir
4949
// fn main::{{closure}}(_1: &ReErased [closure@NodeId(46)], _2: &ReErased mut i32) -> bool {
5050
// ...
5151
// bb0: {
@@ -63,4 +63,4 @@ fn main() {
6363
// }
6464
// ...
6565
// }
66-
// END rustc.main.{{closure}}.EraseRegions.after.mir
66+
// END rustc.main-{{closure}}.EraseRegions.after.mir

0 commit comments

Comments
 (0)