Remove ExplicitSelf from HIR by petrochenkov · Pull Request #33505 · rust-lang/rust

petrochenkov · 2016-05-08T18:25:20Z

self argument is already kept in the argument list and can be retrieved from there if necessary, so there's no need for the duplication.
The same changes can be applied to AST, I'll make them in the next breaking batch.
The first commit also improves parsing of method declarations and fixes#33413.

r? @eddyb

eddyb · 2016-05-09T00:13:42Z

LGTM, cc @nrc, @Manishearth, @jseyfried

eddyb · 2016-05-09T00:14:32Z

This is actually sort of cool 👍.

nrc · 2016-05-09T04:38:50Z

I think this is good.

Question (more important for an AST change than the HIR): can we tell the difference between &self and self: &Self?

petrochenkov · 2016-05-09T10:04:19Z

@nrc

Question (more important for an AST change than the HIR): can we tell the difference between &self and self: &Self?

Yes,
&self is self: &_
self: &Self is self: &Self.
(There are no AST changes in this PR though, except that the first Arg is constructed more precisely.)

nrc · 2016-05-09T20:01:51Z

@petrochenkov hmm, that seems fine for the HIR, but not ideal for the AST. We should maybe try something else there.

petrochenkov · 2016-05-09T21:12:01Z

&self is self: &_

Hm, with this PR fn f(self: _) and fn f(self: &_) start compiling when manually written in the source code (they didn't before).
If this is not acceptable, I'll have to add one more flag to HIR indicating that one of the self shortcuts was indeed used.

nrc · 2016-05-09T23:06:47Z

If this is not acceptable, I'll have to add one more flag to HIR indicating that one of the self shortcuts was indeed used.

This feels like something which should be caught and reported during lowering, rather than being stored in the HIR (to clarify, I think we should catch this before landing this PR).

bors · 2016-05-10T06:56:04Z

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

petrochenkov · 2016-05-10T21:28:53Z

I've added a special check for self: _ and self: &_ in lowering.rs

bors · 2016-05-11T10:06:42Z

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

petrochenkov · 2016-05-11T20:47:58Z

Rebased.

petrochenkov · 2016-05-13T23:58:11Z

ping @eddyb or @nrc

nrc · 2016-05-14T03:28:02Z

r? nrc

bors · 2016-05-14T04:06:04Z

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

Fix spans and expected token lists, fixrust-lang#33413 + other cosmetic improvements Add test for rust-lang#33413 Convert between `Arg` and `ExplicitSelf` precisely Simplify pretty-printing for methods

petrochenkov · 2016-05-14T11:28:33Z

Rebased.

nrc · 2016-05-15T22:33:51Z

@bors: r+

bors · 2016-05-15T22:33:51Z

📌 Commit a62a690 has been approved by nrc

nrc · 2016-05-15T22:34:58Z

@bors: r-

(Whoops, wrong PR)

nrc · 2016-05-15T23:20:16Z

+ /// `self`, `mut self`
+ Value(Ident),
+ /// `&'lt self`, `&'lt mut self`
+ Region(Option<Lifetime>, Mutability, Ident),


Borrowed is better than Region, I think

oh nm, this is just moved code

nrc · 2016-05-15T23:28:21Z

@bors: r+

bors · 2016-05-15T23:28:24Z

📌 Commit a62a690 has been approved by nrc

bors · 2016-05-16T06:14:53Z

⌛ Testing commit a62a690 with merge e87cd7e...

@eddyb

Remove ExplicitSelf from HIR `self` argument is already kept in the argument list and can be retrieved from there if necessary, so there's no need for the duplication. The same changes can be applied to AST, I'll make them in the next breaking batch. The first commit also improves parsing of method declarations and fixes#33413. r? @eddyb

bors · 2016-05-16T09:47:10Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-32cross-opt, auto-linux-64-cargotest, auto-linux-64-cross-armhf, auto-linux-64-cross-armsf, auto-linux-64-cross-freebsd, auto-linux-64-cross-netbsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-mir, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-cross-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-mir, auto-win-msvc-64-opt-rustbuild

kriomant · 2016-05-24T04:28:09Z

Seems like this PR broke my compiler plugin. Can't you please help to fix it?

UPD: problem solved (see topic)

@nrc

The AST part of rust-lang#33505. rust-lang#33505 isn't landed yet, so this PR is based on top of it. r? @nrc plugin-[breaking-change] cc rust-lang#31645 @Manishearth

@nrc

The AST part of rust-lang#33505. rust-lang#33505 isn't landed yet, so this PR is based on top of it. r? @nrc plugin-[breaking-change] cc rust-lang#31645 @Manishearth

rust-highfive assigned eddyb May 8, 2016

eddyb reviewed May 9, 2016
View reviewed changes

Comment threadsrc/libsyntax/ast.rs Outdated
eddybMay 9, 2016
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.
This is actually sort of cool 👍.

petrochenkov force-pushed the self branch from 14c2b8a to fa9fc38Compare May 10, 2016 21:25

petrochenkov force-pushed the self branch from fa9fc38 to 7aa2c27Compare May 11, 2016 20:47

petrochenkov added 3 commits May 14, 2016 13:23

syntax: Refactor parsing of method declarations
212d5d4
Fix spans and expected token lists, fixrust-lang#33413 + other cosmetic improvements Add test for rust-lang#33413 Convert between `Arg` and `ExplicitSelf` precisely Simplify pretty-printing for methods

Remove ExplicitSelf from HIR
766f9b5

Add checks for self: _ and self: &_
a62a690

petrochenkov force-pushed the self branch from 7aa2c27 to a62a690Compare May 14, 2016 11:27

petrochenkov mentioned this pull request May 15, 2016
Remove ExplicitSelf from AST #33644
Merged

nrc reviewed May 15, 2016
View reviewed changes

bors merged commit a62a690 into rust-lang:masterMay 16, 2016

This was referenced May 16, 2016
Don't suggest using fields in a static method #33615
Merged
Remove hir::Ident #33654
Merged

mcarton mentioned this pull request May 17, 2016
Rustup to *1.10.0-nightly (cd6a40017 2016-05-16)*, bump to 0.0.68 rust-lang/rust-clippy#942
Merged

petrochenkov deleted the self branch September 21, 2016 19:56

Uh oh!

Uh oh!

Conversation

petrochenkov commented May 8, 2016

Uh oh!

eddyb commented May 9, 2016

Uh oh!

eddybMay 9, 2016

Choose a reason for hiding this comment

Uh oh!

nrc commented May 9, 2016

Uh oh!

petrochenkov commented May 9, 2016

Uh oh!

nrc commented May 9, 2016

Uh oh!

petrochenkov commented May 9, 2016

Uh oh!

nrc commented May 9, 2016

Uh oh!

bors commented May 10, 2016

Uh oh!

petrochenkov commented May 10, 2016

Uh oh!

bors commented May 11, 2016

Uh oh!

petrochenkov commented May 11, 2016

Uh oh!

petrochenkov commented May 13, 2016

Uh oh!

nrc commented May 14, 2016

Uh oh!

bors commented May 14, 2016

Uh oh!

petrochenkov commented May 14, 2016

Uh oh!

nrc commented May 15, 2016

Uh oh!

bors commented May 15, 2016

Uh oh!

nrc commented May 15, 2016

Uh oh!

nrcMay 15, 2016

Choose a reason for hiding this comment

Uh oh!

nrcMay 15, 2016

Choose a reason for hiding this comment

Uh oh!

nrc commented May 15, 2016

Uh oh!

bors commented May 15, 2016

Uh oh!

bors commented May 16, 2016

Uh oh!

bors commented May 16, 2016

Uh oh!

kriomant commented May 24, 2016• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

kriomant commented May 24, 2016•
edited
Loading