Skip to content

Rollup of 4 pull requests #118141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
matthiaskrgr wants to merge 9 commits into from
Closed

Rollup of 4 pull requests #118141

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0000b35
Document DefiningAnchor a bit more
compiler-errors Nov 20, 2023
273dc22
Don't ICE when ambiguity is found when selecting Index implementation…
compiler-errors Nov 20, 2023
018b859
Add VarDebugInfo to Stable MIR
ouz-a Nov 16, 2023
d0dd19a
de-structure variable and add stables
ouz-a Nov 17, 2023
0b25415
remove quotation from filename
ouz-a Nov 21, 2023
6e65a08
Rollup merge of #117972 - ouz-a:stable_debuginfo, r=celinval
matthiaskrgr Nov 21, 2023
29c4bb1
Rollup merge of #118110 - compiler-errors:defining-anchor, r=aliemjay
matthiaskrgr Nov 21, 2023
2c85424
Rollup merge of #118112 - compiler-errors:index-ambiguity-ice, r=alie…
matthiaskrgr Nov 21, 2023
a687126
Rollup merge of #118135 - ouz-a:fix_stable_span, r=celinval
matthiaskrgr Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions compiler/rustc_smir/src/rustc_smir/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,15 +72,13 @@ impl<'tcx> Context for TablesWrapper<'tcx> {

fn get_filename(&self, span: &Span) -> Filename {
let tables = self.0.borrow();
opaque(
&tables
.tcx
.sess
.source_map()
.span_to_filename(tables[*span])
.display(rustc_span::FileNameDisplayPreference::Local)
.to_string(),
)
tables
.tcx
.sess
.source_map()
.span_to_filename(tables[*span])
.display(rustc_span::FileNameDisplayPreference::Local)
.to_string()
}

fn get_lines(&self, span: &Span) -> LineInfo {
Expand Down
2 changes: 1 addition & 1 deletion compiler/stable_mir/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ pub enum ItemKind {
Const,
}

pub type Filename = Opaque;
pub type Filename = String;

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