Skip to content

Sync with rustc_span changes - #1794

Merged
bors merged 2 commits into
rust-lang:masterfrom
cbeuw:83813
May 12, 2021
Merged

Sync with rustc_span changes#1794
bors merged 2 commits into
rust-lang:masterfrom
cbeuw:83813

Conversation

@cbeuw

@cbeuw cbeuw commented May 12, 2021

Copy link
Copy Markdown
Contributor

rust-lang/rust#83813 made some changes to SourceMap and RealFileName. Now to get a string from a rustc_span::FileName, we need to specify if we would like the local filesystem path or remapped path via --remap-path-prefix. There seems to be only one place in miri that requires change.

@cbeuw

cbeuw commented May 12, 2021

Copy link
Copy Markdown
Contributor Author

The dev guide says to wait for a new nightly for this sort of change but there's a rust-version file so I assume that pins to the right commit?

@cbeuw
cbeuw marked this pull request as ready for review May 12, 2021 14:02
@RalfJung

Copy link
Copy Markdown
Member

The dev guide says to wait for a new nightly for this sort of change

That is outdated information; could you link me to where you found that?

Comment thread src/shims/backtrace.rs Outdated
@cbeuw

cbeuw commented May 12, 2021

Copy link
Copy Markdown
Contributor Author

The dev guide says to wait for a new nightly for this sort of change

That is outdated information; could you link me to where you found that?

https://rustc-dev-guide.rust-lang.org/contributing.html?highlight=Dance#external-dependencies-submodules

It seems correct for rustfmt (until the PR that turns it into a subtree lands) as that pins the version to a nightly, not commit.

@RalfJung

Copy link
Copy Markdown
Member

Thanks; I'll see to updating those docs. :)

@RalfJung

Copy link
Copy Markdown
Member

Thanks for taking care of this. :)
@bors r+

@bors

bors commented May 12, 2021

Copy link
Copy Markdown
Contributor

📌 Commit 5b88045 has been approved by RalfJung

@bors

bors commented May 12, 2021

Copy link
Copy Markdown
Contributor

⌛ Testing commit 5b88045 with merge bcae331...

@cbeuw

cbeuw commented May 12, 2021

Copy link
Copy Markdown
Contributor Author

@RalfJung just a heads up, it looks like the last bors job needs manual approval :)

@bors

bors commented May 12, 2021

Copy link
Copy Markdown
Contributor

☀️ Test successful - checks-actions
Approved by: RalfJung
Pushing bcae331 to master...

@bors
bors merged commit bcae331 into rust-lang:master May 12, 2021
@cbeuw
cbeuw deleted the 83813 branch May 12, 2021 15:44
@RalfJung

Copy link
Copy Markdown
Member

That's just the PR CI job that needs approval; bors will do its thing on a different branch and bors r+ is all the approval it needs. :)

Comment thread rust-version
@@ -1 +1 @@
506e75cbf8cb5305e49a41326307004ca3976029
e1ff91f439bc09f566da211c6449821b4e949279 No newline at end of file

@ghost ghost May 14, 2021

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

This file is missing the final newline, causing the ./rustup-toolchain script always changes this file to insert a newline here.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants