Skip to content

Merge ast::Mutability and mir::Mutability - #67355

Merged
bors merged 3 commits into
rust-lang:masterfrom
Centril:merge-mut
Dec 21, 2019
Merged

Merge ast::Mutability and mir::Mutability#67355
bors merged 3 commits into
rust-lang:masterfrom
Centril:merge-mut

Conversation

@Centril

@CentrilCentril commented Dec 16, 2019

Copy link
Copy Markdown
Contributor

@rust-highfive

This comment has been minimized.

Sign in to view
@CentrilCentril added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Dec 16, 2019
@Centril

Centril commented Dec 16, 2019

Copy link
Copy Markdown
ContributorAuthor

N.B. This will break Clippy so merging should wait a bit.

@CentrilCentril closed this Dec 18, 2019
@CentrilCentril reopened this Dec 18, 2019
oli-obk
oli-obk reviewed Dec 19, 2019
View reviewed changes
Comment threadsrc/librustc_lint/unused.rs Outdated
@CentrilCentril added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Dec 19, 2019
oli-obk
oli-obk reviewed Dec 20, 2019
View reviewed changes
Comment threadsrc/librustdoc/clean/mod.rs Outdated

@oli-obkoli-obkDec 20, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

why has rustdoc its own mutability enum?

@CentrilCentrilDec 20, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Something rustdoc-wants-to-be-more-independent something something, cc @GuillaumeGomez

@GuillaumeGomezGuillaumeGomezDec 20, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

We do it for all hir types. If it can be removed, everyone will be happy though. ;)

@CentrilCentrilDec 20, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

Don't see why it couldn't be removed; should be quite easy.

@GuillaumeGomezGuillaumeGomezDec 21, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I didn't look (and still haven't) so I don't know if it's possible or not. The idea behind clean rustdoc types is to provide a type with direct access to what rustdoc needs. If the rustdoc type doesn't provide anything more than the original, then it can (and should) be removed. Might be worth opening an issue about this.

oli-obk
oli-obk reviewed Dec 20, 2019
View reviewed changes
Comment threadsrc/libsyntax/print/pprust.rs Outdated

@oli-obkoli-obkDec 20, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

all these comparisons make me wonder if we should have is_mut() and is_immut() helper methods

@CentrilCentrilDec 20, 2019

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

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

I would suggest just nixing PartialEq by using the beautiful if let instead.

@oli-obk

oli-obk commented Dec 20, 2019

Copy link
Copy Markdown
Contributor

@bors r+

@rust-lang/clippy (trivial) but a lot of breakage incoming

@bors

bors commented Dec 20, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 9fa6f34d3ec540efd6e7465c0af54d47911c809e has been approved by oli-obk

@bors

bors commented Dec 20, 2019

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@borsbors 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 Dec 20, 2019
@bors

This comment has been minimized.

Sign in to view
@borsbors 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 Dec 20, 2019
@Centril

Centril commented Dec 20, 2019

Copy link
Copy Markdown
ContributorAuthor

@bors r=oli-obk

@bors

bors commented Dec 20, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 6d7c6d7 has been approved by oli-obk

@bors

bors commented Dec 20, 2019

Copy link
Copy Markdown
Collaborator

🌲 The tree is currently closed for pull requests below priority 100, this pull request will be tested once the tree is reopened

@borsbors 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 Dec 20, 2019
@GuillaumeGomezGuillaumeGomez mentioned this pull request Dec 21, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Dec 21, 2019
@Centril
Rollup merge ofrust-lang#67355- Centril:merge-mut, r=oli-obk
c0bf3af
Merge `ast::Mutability` and `mir::Mutability`
r? @oli-obk
@CentrilCentril mentioned this pull request Dec 21, 2019
Merged
bors added a commit that referenced this pull request Dec 21, 2019
@bors
Auto merge of#67485- Centril:rollup-gt0opvr, r=Centril
0a440b1
Rollup of 7 pull requests
Successful merges:
- #67059 (Fix too restrictive checks on Drop impls)
- #67355 (Merge `ast::Mutability` and `mir::Mutability`)
- #67393 (Enable opting out of specific default LLVM arguments.)
- #67422 (Cleanup err codes)
- #67462 (Make ptr::slice_from_raw_parts a const fn available under a feature flag)
- #67467 (Test slice patterns more)
- #67478 (Fix src/libcore/str/mod.rs doc comments)
Failed merges:
r? @ghost
@CentrilCentril mentioned this pull request Dec 21, 2019
Merged
@bors
bors merged commit 6d7c6d7 into rust-lang:masterDec 21, 2019
@Centril
Centril deleted the merge-mut branch December 21, 2019 17:36
@tesujitesuji mentioned this pull request Dec 21, 2019
Merged
bors added a commit to rust-lang/rust-clippy that referenced this pull request Dec 21, 2019
@bors
Auto merge of#4932- lzutao:rustup-67355, r=matthiaskrgr
e3426bf
rustup "Merge `ast::Mutability` and `mir::Mutability`"
cc rust-lang/rust#67355
changelog: none
bors added a commit to rust-lang/rust-clippy that referenced this pull request Dec 21, 2019
@bors
Auto merge of#4932- lzutao:rustup-67355, r=matthiaskrgr
cfb3320
rustup "Merge `ast::Mutability` and `mir::Mutability`"
cc rust-lang/rust#67355
changelog: none
calebcartwright added a commit to calebcartwright/rustfmt that referenced this pull request Jan 16, 2020
@calebcartwright
refactor: update ast::Mutabiltiy variants
f87fe48
`Mutability` variants were renamed to `Not` and `Mut`
rust-lang/rust#67355
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@oli-obkoli-obkoli-obk left review comments
@GuillaumeGomezGuillaumeGomezGuillaumeGomez left review comments

Assignees

@oli-obkoli-obk

Labels

S-waiting-on-borsStatus: 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.

5 participants

@Centril@rust-highfive@oli-obk@bors@GuillaumeGomez