[WIP] Implement RFC 1560. by jseyfried · Pull Request #32213 · rust-lang/rust

jseyfried · 2016-03-12T12:16:27Z

This prototypes rust-lang/rfcs#1560 (cc #35120).

More specifically,

Items and named imports shadow glob imports.
Multiple globs can import the same name if the name is unused or the imports are shadowed.
Multiple globs can import the same name if the imports are of the same item (following re-exports).
- The visibility of such a name is the maximum visibility of the imports.
- Equivalently, adding a glob import will never reduce the visibility of a name, nor will removing one increase it.
Non-prelude private imports can be used wherever we currently allow private items to be used.
- Prelude-imported names are unaffected, i.e. they continue to be usable only in lexical scopes.
Globs import all visible names, not just public names.
- Equivalently, glob importing from an ancestor module imports all of the ancestor's names, and glob importing from other modules is unchanged.
- The visibility of a glob-imported name is the minimum visibility of the glob itself and the name in the imported module. In particular, pub use super::* is equivalent to useing the private names and pub useing the public names from super (modulo shadowing). See this comment from resolve: Privacy rules for re-exports can be too restrictive #31783.

This implementation still needs documentation, tests, and more precise diagnostics (most importantly, an error for when an ambiguous name is used), but other than that it is complete.

retep998 · 2016-03-12T15:37:54Z

Also if you could test it on Windows with winapi since that makes use of recursive globs.

bors · 2016-03-13T00:23:54Z

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

jseyfried · 2016-03-13T01:40:02Z

cc @petrochenkov

alexcrichton · 2016-03-13T05:28:07Z

Unfortunately I broke make dist in #32133, so crater isn't working as it can't build a compiler from this commit. Can you rebase on #32217 once it lands? That should enable a crater run!

bors · 2016-03-13T21:25:40Z

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

nrc · 2016-03-14T01:04:48Z

Just a note that the proposed changes are a draft RFC that hasn't been PR'ed yet, we should wait for the RFC to be approved (and of course to be a PR first) before landing this.

I would be curious to see a crater run in the meantime though.

jseyfried · 2016-03-14T02:10:27Z

we should wait for the RFC to be approved before landing this

I know; this is a ways off from being ready to land regardless.

jseyfried · 2016-03-14T02:11:29Z

@alexcrichton I had to rebase anyway -- this should be ready for a crater run now!

alexcrichton · 2016-03-14T05:38:14Z

r? @nikomatsakis (or @nrc, ... or others!)

alexcrichton · 2016-03-14T05:39:46Z

(also started a crater run)

jseyfried · 2016-03-14T05:45:21Z

(also started a crater run)

Thanks!

alexcrichton · 2016-03-14T20:32:13Z

Oh dear, looks like quite a few regressions :(

jonas-schievink · 2016-03-14T20:36:54Z

Most of them seem to be caused by the use of bitflags

jseyfried · 2016-03-15T00:35:38Z

All of the root regressions appear to be due to a bug that I fixed in the above commit.

I had generalized the last bullet point ("The visibility of a glob-imported name is the minimum visibility of the glob itself and the name in the imported module") to apply to single imports as well. This won't make a difference once the warning cycle from #31362 is complete, but until then a pub single import of a private extern crate should be public, not private.

alexcrichton · 2016-03-15T05:38:39Z

Scheduled another crater run

alexcrichton · 2016-03-15T17:02:42Z

Hurray, zero regressions!

jseyfried · 2016-03-16T07:50:53Z

Excellent. It also looks like these changes fix two crates that were broken by new names in upstream crates.

bors · 2016-03-17T01:33:11Z

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

bors · 2016-04-06T16:33:41Z

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

bors · 2016-04-13T08:27:54Z

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

bors · 2016-04-17T01:37:48Z

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

alexcrichton · 2016-07-19T04:05:43Z

@jseyfried this has been inactive for awhile now, should we close or try to rebase + land?

jseyfried · 2016-07-19T08:31:36Z

@alexcrichton I'm planning on rebasing, finishing this up, and ~~maybe~~ feature gating once RFC 1560 goes into FCP, which should be any day now.

alexcrichton · 2016-07-19T15:43:35Z

Ok, awesome!

@nrc

… r=nrc resolve: diagnostics improvement and groundwork for RFC 1560 Fixes#35115, fixes#35135, and lays groundwork for #32213 (cc #35120). r? @nrc

nikomatsakis · 2016-08-12T21:23:15Z

@jseyfried going to close this PR due to inactivity. Feel free to re-open though. :)

jseyfried · 2016-08-22T10:29:01Z

I finished this in #35894.

jseyfried force-pushed the new_import_semantics branch 4 times, most recently from e333048 to c759b3eCompare March 12, 2016 13:26

jseyfried force-pushed the new_import_semantics branch 2 times, most recently from 4ebba6d to 5c3ab23Compare March 12, 2016 22:15

jseyfried force-pushed the new_import_semantics branch from 5c3ab23 to 1e48cd1Compare March 13, 2016 00:34

jseyfried force-pushed the new_import_semantics branch from 1e48cd1 to 6dbe2adCompare March 13, 2016 06:28

jseyfried force-pushed the new_import_semantics branch from 6dbe2ad to 349958cCompare March 14, 2016 00:43

rust-highfive assigned nikomatsakis Mar 14, 2016

alexcrichton added the S-waiting-on-crater Status: Waiting on a crater run to be completed. label Mar 14, 2016

alexcrichton removed the S-waiting-on-crater Status: Waiting on a crater run to be completed. label Mar 15, 2016

jseyfried force-pushed the new_import_semantics branch from 9ae2401 to 698caddCompare April 7, 2016 04:38

jseyfried mentioned this pull request Apr 11, 2016
Implement pub(restricted) privacy (RFC 1422) #32875
Merged

jseyfried added 5 commits April 14, 2016 05:21

Allow glob imports to be shadowed by items and single imports.
bf9f60a

Allow multiple glob imports of the same item.
4712d18

Allow unused ambiguous glob imports.
3e34771

Make all visible items glob importable.
4a3adf9

Treat private imports like private items.
573c1d5

jseyfried force-pushed the new_import_semantics branch 3 times, most recently from 4c2626e to 0d86604Compare April 14, 2016 06:54

jseyfried added 3 commits April 14, 2016 18:18

Make pub single imports of private extern crates public.
87403b8

Fix fallout in the compiler (newly unused glob imports).
5896b67

Fix fallout in tests.
1402963

jseyfried force-pushed the new_import_semantics branch from 0d86604 to 1402963Compare April 14, 2016 18:19

jseyfried changed the title ~~[WIP] Changes to name resolution rules (shadowable globs, item-like private imports, etc.)~~[WIP] Implement RFC 1560.Jul 29, 2016

jseyfried mentioned this pull request Jul 29, 2016
resolve: diagnostics improvement and groundwork for RFC 1560 #35116
Merged

bors added a commit that referenced this pull request Aug 5, 2016
Auto merge of#35116- jseyfried:groundwork_for_new_import_semantics,…
7bf54f9
… r=nrc resolve: diagnostics improvement and groundwork for RFC 1560 Fixes#35115, fixes#35135, and lays groundwork for #32213 (cc #35120). r? @nrc

nikomatsakis closed this Aug 12, 2016

jseyfried mentioned this pull request Aug 18, 2016
resolve: More groundwork for item_like_imports (RFC 1560) #35776
Merged

Uh oh!

Uh oh!

Conversation

jseyfried commented Mar 12, 2016• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

retep998 commented Mar 12, 2016

Uh oh!

bors commented Mar 13, 2016

Uh oh!

jseyfried commented Mar 13, 2016

Uh oh!

alexcrichton commented Mar 13, 2016

Uh oh!

bors commented Mar 13, 2016

Uh oh!

nrc commented Mar 14, 2016

Uh oh!

jseyfried commented Mar 14, 2016

Uh oh!

jseyfried commented Mar 14, 2016

Uh oh!

alexcrichton commented Mar 14, 2016

Uh oh!

alexcrichton commented Mar 14, 2016

Uh oh!

jseyfried commented Mar 14, 2016

Uh oh!

alexcrichton commented Mar 14, 2016

Uh oh!

jonas-schievink commented Mar 14, 2016

Uh oh!

jseyfried commented Mar 15, 2016

Uh oh!

alexcrichton commented Mar 15, 2016

Uh oh!

alexcrichton commented Mar 15, 2016

Uh oh!

jseyfried commented Mar 16, 2016

Uh oh!

bors commented Mar 17, 2016

Uh oh!

bors commented Apr 6, 2016

Uh oh!

bors commented Apr 13, 2016

Uh oh!

bors commented Apr 17, 2016

Uh oh!

alexcrichton commented Jul 19, 2016

Uh oh!

jseyfried commented Jul 19, 2016• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alexcrichton commented Jul 19, 2016

Uh oh!

nikomatsakis commented Aug 12, 2016

Uh oh!

jseyfried commented Aug 22, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

jseyfried commented Mar 12, 2016•
edited
Loading

jseyfried commented Jul 19, 2016•
edited
Loading