Skip to content
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

Jump to bottom

Rename other occs of (Code/File)Map to Source(Map/File) #51574 #55190

Merged
merged 1 commit into from
Oct 30, 2018
Merged

Rename other occs of (Code/File)Map to Source(Map/File) #51574 #55190

merged 1 commit into from
Oct 30, 2018

Conversation

dlavati
Copy link
Contributor

@dlavati dlavati commented Oct 18, 2018

Additional renamings for #51574.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @eddyb (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 18, 2018
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 18, 2018

📌 Commit f37b2a11c6228cab83d397ac369b0224f76460e5 has been approved by Mark-Simulacrum

@bors 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 18, 2018
@bors
Copy link
Contributor

bors commented Oct 20, 2018

☔ The latest upstream changes (presumably #55114) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 20, 2018
bjorn3
bjorn3 requested changes Oct 20, 2018
View reviewed changes
RELEASES.md Outdated
@@ -1164,7 +1164,7 @@ Compatibility Notes
- [Changes in method matching against higher-ranked types][43880] This may cause
breakage in subtyping corner cases. [A more in-depth explanation is available.][info/43880]
- [rustc's JSON error output's byte position start at top of file.][42973]
Was previously relative to the rustc's internal `CodeMap` struct which
Was previously relative to the rustc's internal `SourceMap` struct which
Copy link
Member

Choose a reason for hiding this comment

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

I don't think this sould be changed, because CodeMap was the name back then.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right, it does speak in past tense.

@dlavati
Copy link
Contributor Author

dlavati commented Oct 21, 2018

r? @bjorn3

@bjorn3
Copy link
Member

bjorn3 commented Oct 21, 2018

@dlavati i'm not part of the rust lang org. :)

@dlavati
Copy link
Contributor Author

dlavati commented Oct 21, 2018

r? @petrochenkov this is a follow-up on #52953

@rust-highfive rust-highfive assigned petrochenkov and unassigned eddyb Oct 21, 2018
@petrochenkov
Copy link
Contributor

petrochenkov commented Oct 21, 2018 •
edited
Loading

Could you keep the naming scheme consistent with #52953, i.e.

caching_sourcemap_view -> caching_source_map_view
StableSourcefileId -> StableSourceFileId
MalformedForSourcemap -> MalformedForSourceMap
MalformedSourcemapPositions -> MalformedSourceMapPositions

, and also squash all the changes into one commit.

@dlavati dlavati force-pushed the 51574_rename_codemap_filemap branch 2 times, most recently from ae2007b to 06ed33b Compare October 22, 2018 22:58
@petrochenkov
Copy link
Contributor

Thanks!
@bors r+

@bors
Copy link
Contributor

bors commented Oct 23, 2018

📌 Commit 06ed33b5e75a8c664dfe49d71d3faf15fa4d8a9b has been approved by petrochenkov

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 23, 2018
@bors
Copy link
Contributor

bors commented Oct 25, 2018

☔ The latest upstream changes (presumably #55347) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 25, 2018
@petrochenkov
Copy link
Contributor

@dlavati
This still needs a rebase.

@dlavati dlavati force-pushed the 51574_rename_codemap_filemap branch from 06ed33b to 6c9f6a1 Compare October 29, 2018 20:27
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Oct 29, 2018

📌 Commit 6c9f6a1 has been approved by petrochenkov

@bors 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 29, 2018
@bors
Copy link
Contributor

bors commented Oct 30, 2018

⌛ Testing commit 6c9f6a1 with merge fb2446a...

bors added a commit that referenced this pull request Oct 30, 2018
@bors
Auto merge of #55190 - dlavati:51574_rename_codemap_filemap, r=petroc…
fb2446a 
…henkov

Rename other occs of (Code/File)Map to Source(Map/File) #51574

Additional renamings for #51574.
@bors
Copy link
Contributor

bors commented Oct 30, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: petrochenkov
Pushing fb2446a to master...

@bors bors merged commit 6c9f6a1 into rust-lang:master Oct 30, 2018
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #55190!

Tested on commit fb2446a.
Direct link to PR: #55190

💔 clippy-driver on windows: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 rls on windows: test-fail → build-fail (cc @nrc, @rust-lang/infra).
💔 rls on linux: test-fail → build-fail (cc @nrc, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Oct 30, 2018
@rust-highfive
📣 Toolstate changed by rust-lang/rust#55190!
4be3d7c 
Tested on commit rust-lang/rust@fb2446a.
Direct link to PR: <rust-lang/rust#55190>

💔 clippy-driver on windows: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 clippy-driver on linux: test-fail → build-fail (cc @Manishearth @llogiq @mcarton @oli-obk, @rust-lang/infra).
💔 rls on windows: test-fail → build-fail (cc @nrc, @rust-lang/infra).
💔 rls on linux: test-fail → build-fail (cc @nrc, @rust-lang/infra).
@bors bors mentioned this pull request Oct 30, 2018
Merged
@Manishearth Manishearth mentioned this pull request Oct 30, 2018
Merged
bors bot added a commit to rust-lang/rust-clippy that referenced this pull request Oct 30, 2018
@bors @Manishearth
Merge #3382
ecda26e 
3382: Rustup to rustc 1.31.0-nightly (fb2446a 2018-10-30) r=Manishearth a=Manishearth

Fixes breakage caused by rust-lang/rust#55190

Co-authored-by: Manish Goregaokar <manishsmail@gmail.com>
@eddyb eddyb mentioned this pull request Nov 3, 2018
Closed
@dtolnay dtolnay mentioned this pull request Apr 22, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bjorn3 bjorn3 bjorn3 requested changes

Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@dlavati @rust-highfive @Mark-Simulacrum @bors @bjorn3 @petrochenkov @eddyb