Skip to content

Conversation

davidbarsky
Copy link
Contributor

@davidbarsky davidbarsky commented Oct 17, 2024

Fixes #18318. I also took the opportunity to refactor how discoverSourceFileMap worked—it now returns a type instead of mutating a map in place.

I tested this change using the LLDB DAP extension. I needed to set "lldb-dap.executable-path": "/Applications/Xcode.app/Contents/Developer/usr/bin/lldb-dap" for everything to work, however, but once I did, was able to successfully debug a test.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 17, 2024
@@ -189,11 +203,15 @@ async function getDebugConfiguration(
return debugConfig;
}

type SourceFileMap = {
source: string;
destination: string;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: maybe target, but don't bother changing it.

@davidbarsky
Copy link
Contributor Author

@bors r+

@bors
Copy link
Contributor

bors commented Oct 17, 2024

📌 Commit f25cb19 has been approved by davidbarsky

It is now in the queue for this repository.

bors added a commit that referenced this pull request Oct 17, 2024
…ustc, r=davidbarsky

internal: fix lldb-dap unconditionally calling rustc

Fixes #18318. I also took the opportunity to refactor how `discoverSourceFileMap` worked—it now returns a type instead of mutating a map in place.

I tested this change using the LLDB DAP extension. I needed to set `"lldb-dap.executable-path": "/Applications/Xcode.app/Contents/Developer/usr/bin/lldb-dap"` for everything to work, however, but once I did, was able to successfully debug a test.
@bors
Copy link
Contributor

bors commented Oct 17, 2024

⌛ Testing commit f25cb19 with merge 02cacbf...

@davidbarsky
Copy link
Contributor Author

@bors retry

bors added a commit that referenced this pull request Oct 17, 2024
…ustc, r=davidbarsky

internal: fix lldb-dap unconditionally calling rustc

Fixes #18318. I also took the opportunity to refactor how `discoverSourceFileMap` worked—it now returns a type instead of mutating a map in place.

I tested this change using the LLDB DAP extension. I needed to set `"lldb-dap.executable-path": "/Applications/Xcode.app/Contents/Developer/usr/bin/lldb-dap"` for everything to work, however, but once I did, was able to successfully debug a test.
@bors
Copy link
Contributor

bors commented Oct 17, 2024

⌛ Testing commit f25cb19 with merge 28a1126...

@bors
Copy link
Contributor

bors commented Oct 17, 2024

💥 Test timed out

@davidbarsky
Copy link
Contributor Author

@bors retry

bors added a commit that referenced this pull request Oct 17, 2024
…ustc, r=davidbarsky

internal: fix lldb-dap unconditionally calling rustc

Fixes #18318. I also took the opportunity to refactor how `discoverSourceFileMap` worked—it now returns a type instead of mutating a map in place.

I tested this change using the LLDB DAP extension. I needed to set `"lldb-dap.executable-path": "/Applications/Xcode.app/Contents/Developer/usr/bin/lldb-dap"` for everything to work, however, but once I did, was able to successfully debug a test.
@bors
Copy link
Contributor

bors commented Oct 17, 2024

⌛ Testing commit f25cb19 with merge bad55dc...

@bors
Copy link
Contributor

bors commented Oct 17, 2024

💥 Test timed out

@Veykril
Copy link
Member

Veykril commented Oct 18, 2024

@bors retry

@bors
Copy link
Contributor

bors commented Oct 18, 2024

⌛ Testing commit f25cb19 with merge 91c0bef...

bors added a commit that referenced this pull request Oct 18, 2024
…ustc, r=davidbarsky

internal: fix lldb-dap unconditionally calling rustc

Fixes #18318. I also took the opportunity to refactor how `discoverSourceFileMap` worked—it now returns a type instead of mutating a map in place.

I tested this change using the LLDB DAP extension. I needed to set `"lldb-dap.executable-path": "/Applications/Xcode.app/Contents/Developer/usr/bin/lldb-dap"` for everything to work, however, but once I did, was able to successfully debug a test.
@bors
Copy link
Contributor

bors commented Oct 18, 2024

💔 Test failed - checks-actions

@Veykril
Copy link
Member

Veykril commented Oct 18, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Oct 18, 2024

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.

@bors
Copy link
Contributor

bors commented Oct 18, 2024

📌 Commit f25cb19 has been approved by Veykril

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Oct 18, 2024

⌛ Testing commit f25cb19 with merge c116ff6...

@bors
Copy link
Contributor

bors commented Oct 18, 2024

☀️ Test successful - checks-actions
Approved by: Veykril
Pushing c116ff6 to master...

@bors bors merged commit c116ff6 into rust-lang:master Oct 18, 2024
8 of 11 checks passed
@davidbarsky davidbarsky deleted the davidbarsky/fix-lldb-dap-calling-rustc branch November 21, 2024 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Extension fails to start on latest nightly
5 participants