Rename CodeMap/FileMap to SourceMap/SourceFile #52953
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
dsciarra
force-pushed
the
mv-codemap-sourcemap
branch
from
afb54b0
to
ed04285
Compare
|
It would be nice to use same case conventions for everything and consistently treat "source map" and "file map" as two words ( |
petrochenkov
added
S-waiting-on-author
|
Ping from triage, @dsciarra! Some changes have been requested to your PR and it also needs to be rebased. Do you think you'll be able to work on this? |
dsciarra
force-pushed
the
mv-codemap-sourcemap
branch
from
ed04285
to
5c462a6
Compare
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
@TimNN I hope your definition of "ability" does not include time :) @petrochenkov Summary of changes:
Anything to add? |
|
@dsciarra |
dsciarra
force-pushed
the
mv-codemap-sourcemap
branch
from
5c462a6
to
99554c1
Compare
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
dsciarra
force-pushed
the
mv-codemap-sourcemap
branch
2 times, most recently
from
bf31cad
to
6fcdcf6
Compare
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
dsciarra
force-pushed
the
mv-codemap-sourcemap
branch
from
6fcdcf6
to
97181ea
Compare
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
dsciarra
force-pushed
the
mv-codemap-sourcemap
branch
2 times, most recently
from
1e54cce
to
20bfd92
Compare
src/libproc_macro/lib.rs
Outdated
| @@ -306,8 +306,8 @@ impl Span { | |||
|
|
|||
| /// The original source file into which this span points. | |||
| #[unstable(feature = "proc_macro_span", issue = "38356")] | |||
| pub fn source_file(&self) -> SourceFile { | |||
| SourceFile { | |||
| pub fn original_source_file(&self) -> OriginalSourceFile { | |||
There was a problem hiding this comment.
This is a public-facing standard library interface, even if it's unstable.
Let's leave it alone for now and revert this commit.
There was a problem hiding this comment.
A simple revert won't work. I had to come up with another name for this second SourceFile struct. Why not changing it? It's unstable....
There was a problem hiding this comment.
You can just use syntax_pos::SourceFile explicitly without importing it (you can see e.g. syntax_pos::Span being treated in the same way).
|
r=me when Travis is green and the |
|
@bors p=1 |
bors
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Aug 19, 2018
Rename CodeMap/FileMap to SourceMap/SourceFile A first renaming for #51574
|
☀️ Test successful - status-appveyor, status-travis |
|
📣 Toolstate changed by #52953! Tested on commit 6bf6d50. 💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra). |
rust-highfive
added a commit
to rust-lang-nursery/rust-toolstate
that referenced
this pull request
Aug 20, 2018
Tested on commit rust-lang/rust@6bf6d50. Direct link to PR: <rust-lang/rust#52953> 💔 clippy-driver on windows: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra). 💔 clippy-driver on linux: test-pass → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra). 💔 rls on windows: test-pass → build-fail (cc @nrc, @rust-lang/infra). 💔 rls on linux: test-pass → build-fail (cc @nrc, @rust-lang/infra).
This was referenced Aug 20, 2018
Merged
Manishearth
added a commit
to rust-lang/rust-clippy
that referenced
this pull request
Aug 20, 2018
mark-i-m
pushed a commit
to rust-lang/rustc-dev-guide
that referenced
this pull request
Aug 24, 2018
Those types were renamed in rust-lang/rust#52953
matthiaskrgr
added a commit
to matthiaskrgr/rls
that referenced
this pull request
Aug 24, 2018
ehuss
added a commit
to ehuss/cargo
that referenced
this pull request
Aug 24, 2018
bors
added a commit
to rust-lang/cargo
that referenced
this pull request
Aug 24, 2018
Fix test failure on nightly due to `codemap::Span` change. Update due to rust-lang/rust#52953.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A first renaming for #51574