Skip to content

Commit 5f8cdb3

Browse files
authored
Unrolled build for rust-lang#118135
Rollup merge of rust-lang#118135 - ouz-a:fix_stable_span, r=celinval Remove quotation from filename in stable_mir Previously we had quotation marks in filenames which is obviously wrong this fixes that. r? ```@celinval```
2 parents fec80b4 + 0b25415 commit 5f8cdb3

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

compiler/rustc_smir/src/rustc_smir/mod.rs

+7-9
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,13 @@ impl<'tcx> Context for TablesWrapper<'tcx> {
6969

7070
fn get_filename(&self, span: &Span) -> Filename {
7171
let tables = self.0.borrow();
72-
opaque(
73-
&tables
74-
.tcx
75-
.sess
76-
.source_map()
77-
.span_to_filename(tables[*span])
78-
.display(rustc_span::FileNameDisplayPreference::Local)
79-
.to_string(),
80-
)
72+
tables
73+
.tcx
74+
.sess
75+
.source_map()
76+
.span_to_filename(tables[*span])
77+
.display(rustc_span::FileNameDisplayPreference::Local)
78+
.to_string()
8179
}
8280

8381
fn get_lines(&self, span: &Span) -> LineInfo {

compiler/stable_mir/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ pub enum ItemKind {
110110
Const,
111111
}
112112

113-
pub type Filename = Opaque;
113+
pub type Filename = String;
114114

115115
/// Holds information about an item in the crate.
116116
#[derive(Copy, Clone, PartialEq, Eq, Debug)]

0 commit comments

Comments
 (0)