Add ability to get lines/filename for Span in smir by ouz-a · Pull Request #116630 · rust-lang/rust

ouz-a · 2023-10-11T09:49:46Z

Wasn't sure about how to structure lines, so went with safest option, also I'm not sure why span_to_lines returns vec.

Addresses rust-lang/project-stable-mir#44

r? @oli-obk

rustbot · 2023-10-11T09:49:57Z

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

oli-obk · 2023-10-11T11:07:48Z

@celinval does this format contain what you need?

What are you planning on using these for? If it's just for diagnostics, does the opaque rendered version suffice?

oli-obk · 2023-10-11T11:10:01Z

compiler/stable_mir/src/ty.rs

+
+#[derive(Clone, Copy, Debug)]
+pub struct LineInfo {
+    pub line_index: usize,


document whether the first line is 0 or whether it is 1. Similarly for col

made them start from 1 now

compiler/stable_mir/src/ty.rs

rustbot · 2023-10-11T14:56:08Z

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

celinval

Thanks @ouz-a!

celinval · 2023-10-13T02:09:48Z

compiler/rustc_smir/src/rustc_smir/mod.rs

+        )
+    }
+
+    fn get_lines(&self, span: &Span) -> Vec<stable_mir::ty::LineInfo> {


I would suggest that you return something similar to span_to_location_info.

It basically returns the line + column for beginning and end of the span.

I modified LineInfo struct so it looks like line,col:beg; line,col;end

Perfect! Thanks

compiler/rustc_smir/src/rustc_smir/mod.rs

compiler/stable_mir/src/lib.rs

celinval · 2023-10-13T02:26:41Z

@oli-obk, we use the output for diagnostic but also in our vscode extension, code coverage and the trace generator. So ideally we would like to be able to map beginning and end of a span to the exact location in a local file.

oli-obk · 2023-10-13T11:11:13Z

@bors r+ rollup

bors · 2023-10-13T11:11:16Z

📌 Commit d6a55d3 has been approved by oli-obk

It is now in the queue for this repository.

Add ability to get lines/filename for Span in smir Wasn't sure about how to structure lines, so went with safest option, also I'm not sure why `span_to_lines` returns `vec`. Addresses rust-lang/project-stable-mir#44 r? `@oli-obk`

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#116630 (Add ability to get lines/filename for Span in smir) - rust-lang#116644 (remove outdated bootstrap FIXME) - rust-lang#116695 (Fix a comment) - rust-lang#116696 (Misc improvements) - rust-lang#116704 (Fix AFIT lint message to mention pitfall) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#116630 - ouz-a:smir_span_better, r=oli-obk Add ability to get lines/filename for Span in smir Wasn't sure about how to structure lines, so went with safest option, also I'm not sure why `span_to_lines` returns `vec`. Addresses rust-lang/project-stable-mir#44 r? ``@oli-obk``

rustbot assigned oli-obk Oct 11, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 11, 2023

oli-obk reviewed Oct 11, 2023

View reviewed changes

compiler/stable_mir/src/ty.rs Outdated Show resolved Hide resolved

implement get_filename/lines for span

1d9481f

ouz-a force-pushed the smir_span_better branch from a40dd10 to 1d9481f Compare October 11, 2023 14:56

celinval reviewed Oct 13, 2023

View reviewed changes

change fn name, return loc info, local name

d6a55d3

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 13, 2023

matthiaskrgr mentioned this pull request Oct 13, 2023

Rollup of 3 pull requests #116694

Closed

matthiaskrgr mentioned this pull request Oct 14, 2023

Rollup of 5 pull requests #116727

Merged

bors merged commit 3890ba9 into rust-lang:master Oct 14, 2023

rustbot added this to the 1.75.0 milestone Oct 14, 2023

Veykril mentioned this pull request Oct 17, 2023

Pull upstream master 2023 10 17 ferrocene/ferrocene#54

Merged

Uh oh!

Conversation

ouz-a commented Oct 11, 2023

Uh oh!

rustbot commented Oct 11, 2023

Uh oh!

oli-obk commented Oct 11, 2023

Uh oh!

oli-obk Oct 11, 2023

Choose a reason for hiding this comment

Uh oh!

ouz-a Oct 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

rustbot commented Oct 11, 2023

Uh oh!

celinval left a comment

Choose a reason for hiding this comment

Uh oh!

celinval Oct 13, 2023

Choose a reason for hiding this comment

Uh oh!

ouz-a Oct 13, 2023

Choose a reason for hiding this comment

Uh oh!

celinval Oct 13, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

celinval commented Oct 13, 2023

Uh oh!

oli-obk commented Oct 13, 2023

Uh oh!

bors commented Oct 13, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

ouz-a Oct 11, 2023 •

edited

Loading