Skip to content

refactor the BorrowckErrors trait to take fn(self) - #48902

Merged
bors merged 3 commits into
rust-lang:masterfrom
csmoe:refactor_BorrowckErrors_fn_self
Mar 20, 2018
Merged

refactor the BorrowckErrors trait to take fn(self)#48902
bors merged 3 commits into
rust-lang:masterfrom
csmoe:refactor_BorrowckErrors_fn_self

Conversation

@csmoe

@csmoecsmoe commented Mar 10, 2018

Copy link
Copy Markdown
Contributor

Fixes#48783

@rust-highfive

rust-highfive commented Mar 10, 2018

Copy link
Copy Markdown
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @petrochenkov (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-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 10, 2018
petrochenkov
petrochenkov reviewed Mar 10, 2018
View reviewed changes
Comment threadsrc/librustc_mir/util/borrowck_errors.rs Outdated
pub trait BorrowckErrors<'cx> {
fn struct_span_err_with_code<S: Into<MultiSpan>>(self,
sp: S,
msg: &str,

@petrochenkovpetrochenkovMar 10, 2018

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.

Formatting is broken here in in few other places.

@petrochenkov

petrochenkov commented Mar 10, 2018

Copy link
Copy Markdown
Contributor

LGTM, r=me after fixing formatting

@petrochenkovpetrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Mar 10, 2018
@csmoe

csmoe commented Mar 11, 2018

Copy link
Copy Markdown
ContributorAuthor

r @petrochenkov
formatting fixed.

@petrochenkov

petrochenkov commented Mar 11, 2018

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Mar 11, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit cb5ac97 has been approved by petrochenkov

@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 Mar 11, 2018
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Mar 12, 2018
@Mark-Simulacrum
Rollup merge ofrust-lang#48902- csmoe:refactor_BorrowckErrors_fn_se…
03a4f9d
…lf, r=petrochenkov
refactor the `BorrowckErrors` trait to take `fn(self)`
Fixesrust-lang#48783
@Mark-SimulacrumMark-Simulacrum mentioned this pull request Mar 12, 2018
Closed
nikomatsakis
nikomatsakis reviewed Mar 14, 2018
View reviewed changes
Comment threadsrc/librustc_mir/util/borrowck_errors.rs Outdated
sp: S,
msg: &str)
-> DiagnosticBuilder<'cx>
where Self: Sized + Copy

@nikomatsakisnikomatsakisMar 14, 2018

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.

Wait -- this where clause should not be needed, right? (I would have probably moved it into the trait, in any case, but it shouldn't be needed in the impls...)

nikomatsakis
nikomatsakis reviewed Mar 15, 2018
View reviewed changes
Comment threadsrc/librustc_mir/util/borrowck_errors.rs Outdated

@nikomatsakisnikomatsakisMar 15, 2018

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.

Nit: I would move these into the trait definition, as the trait is meant to be implemented for references.

nikomatsakis
nikomatsakis reviewed Mar 15, 2018
View reviewed changes
Comment threadsrc/librustc_mir/util/borrowck_errors.rs Outdated

@nikomatsakisnikomatsakisMar 15, 2018

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.

...then you could remove them from all these places

@csmoecsmoeMar 17, 2018

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.

it seems the where clause cannot be removed here:

error[E0277]: the trait bound `Self: std::marker::Sized` is not satisfied
--> librustc_mir/util/borrowck_errors.rs:287:22
|
287 | fn cannot_assign(self, span: Span, desc: &str, o: Origin) -> DiagnosticBuilder<'cx>
| ^^^^ `Self` does not have a constant size known at compile-time
|
= help: the trait `std::marker::Sized` is not implemented for `Self`
= help: consider adding a `where Self: std::marker::Sized` bound
= note: all local variables must have a statically known size

@csmoecsmoeMar 18, 2018•
edited
Loading

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.

@nikomatsakis
the compiler complained that the self in trait should be Sized + Copy, and I found that TyCtxt already #[derive(Copy, Clone)], so I rewrote pub trait BorrowckError<'tcx>: Sized + Copy {} instead of appending where clause in every method. Is this make sense?

@nikomatsakisnikomatsakisMar 19, 2018•
edited
Loading

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.

Yep! That's what I was proposing, in fact.

nikomatsakis
nikomatsakis requested changes Mar 15, 2018
View reviewed changes

@nikomatsakisnikomatsakis left a comment

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.

Thanks @csmoe -- left one more nit :)

@csmoe
csmoeforce-pushed the refactor_BorrowckErrors_fn_self branch 2 times, most recently from 813c57d to 4d24236CompareMarch 18, 2018 11:16
@csmoe
csmoeforce-pushed the refactor_BorrowckErrors_fn_self branch from 4d24236 to 5511624CompareMarch 18, 2018 12:18
@nikomatsakis

nikomatsakis commented Mar 19, 2018

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Mar 19, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 5511624 has been approved by nikomatsakis

kennytm added a commit to kennytm/rust that referenced this pull request Mar 19, 2018
@kennytm
Rollup merge ofrust-lang#48902- csmoe:refactor_BorrowckErrors_fn_se…
7aa6651
…lf, r=nikomatsakis
refactor the `BorrowckErrors` trait to take `fn(self)`
Fixesrust-lang#48783
@kennytmkennytm mentioned this pull request Mar 19, 2018
Merged
bors added a commit that referenced this pull request Mar 20, 2018
@bors
Auto merge of#49190- kennytm:rollup, r=kennytm
75af15e
Rollup of 17 pull requests
- Successful merges: #46518, #48810, #48834, #48902, #49004, #49092, #49096, #49099, #49104, #49125, #49139, #49152, #49157, #49161, #49166, #49176, #49184
- Failed merges:
@bors
bors merged commit 5511624 into rust-lang:masterMar 20, 2018
@csmoe
csmoe deleted the refactor_BorrowckErrors_fn_self branch July 13, 2018 08:43
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nikomatsakisnikomatsakisnikomatsakis requested changes
@petrochenkovpetrochenkovpetrochenkov left review comments

Assignees

@nikomatsakisnikomatsakis

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

@csmoe@rust-highfive@petrochenkov@bors@nikomatsakis