Skip to content

/rust

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.

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

macros: improve `$crate` #37213

Merged
merged 3 commits into from Oct 19, 2016

Conversation

Reviewers
No reviews
Assignees

@nrc nrc

Labels
relnotes
Projects
None yet
Milestone
No milestone
4 participants
@jseyfried @nrc @bors @bluss
@jseyfried
Copy link
Contributor

jseyfried commented Oct 16, 2016 •
edited

This PR refactors the implementation of $crate so that

  • $crate is only allowed at the start of a path (like super),
  • we can make $crate work with inter-crate re-exports (groundwork for macro modularization), and
  • we can support importing macros from an extern crate that is not declared at the crate root (also groundwork for macro modularization).

This is a [breaking-change]. For example, the following would break:

fn foo() {}
macro_rules! m { () => {
    $crate foo $crate () $crate $crate;
    //^ Today, `$crate` is allowed just about anywhere in unexported macros.
} }
fn main() {
    m!();
}

r? @nrc

@rust-highfive rust-highfive assigned nrc Oct 16, 2016

@jseyfried jseyfried changed the title macros: Improve `$crate` macros: improve `$crate` Oct 16, 2016

@jseyfried

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

jseyfried commented Oct 16, 2016

cc #35896
@nrc

This comment has been minimized.

Sign in to view
Copy link
Member

nrc commented Oct 18, 2016

we can support importing macros from an extern crate that is not declared at the crate root

to clarify - this PR doesn't actually allow any changes to the actual importing behaviour of such macros, it just lays internal groundwork to allow this in the future?
@jseyfried

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

jseyfried commented Oct 18, 2016

Right, the only observable change from this PR is restricting where $crate is allowed.
@nrc

This comment has been minimized.

Sign in to view
Copy link
Member

nrc commented Oct 18, 2016

@bors: r+
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Oct 18, 2016

📌 Commit 2676b25 has been approved by nrc

@eddyb eddyb referenced this pull request Oct 18, 2016

Closed

Rollup of 16 pull requests #37262

bors added a commit that referenced this pull request Oct 18, 2016

@bors
Auto merge of #37262 - eddyb:rollup, r=eddyb 
Rollup of 16 pull requests

- Successful merges: #36964, #37117, #37124, #37161, #37193, #37198, #37202, #37208, #37218, #37220, #37221, #37224, #37231, #37233, #37240, #37257
- Failed merges: #37213
b504d01

bors added a commit that referenced this pull request Oct 19, 2016

@bors
Auto merge of #37262 - eddyb:rollup, r=eddyb 
Rollup of 16 pull requests

- Successful merges: #36964, #37117, #37124, #37161, #37193, #37198, #37202, #37208, #37218, #37220, #37221, #37224, #37231, #37233, #37240, #37257
- Failed merges: #37213
Loading status checks…
6777eca

@eddyb eddyb referenced this pull request Oct 19, 2016

Merged

Rollup of 23 pull requests #37269

bors added a commit that referenced this pull request Oct 19, 2016

@bors
Auto merge of #37269 - eddyb:rollup, r=eddyb 
Rollup of 23 pull requests

- Successful merges: #36964, #37108, #37117, #37124, #37161, #37176, #37182, #37193, #37198, #37202, #37208, #37218, #37221, #37224, #37230, #37231, #37233, #37236, #37240, #37254, #37257, #37265, #37267
- Failed merges: #37213, #37220, #37261
Loading status checks…
0c42987
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Oct 19, 2016

🔒 Merge conflict
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Oct 19, 2016

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

@jseyfried jseyfried force-pushed the jseyfried:refactor_crate_var branch from 2676b25 to 8b0c292 Oct 19, 2016

@jseyfried

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

jseyfried commented Oct 19, 2016

@bors r=nrc
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Oct 19, 2016

📌 Commit 8b0c292 has been approved by nrc
@bors

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors commented Oct 19, 2016

⌛️ Testing commit 8b0c292 with merge cfc9b51...

bors added a commit that referenced this pull request Oct 19, 2016

@bors
Auto merge of #37213 - jseyfried:refactor_crate_var, r=nrc 
macros: improve `$crate`

This PR refactors the implementation of `$crate` so that
 - `$crate` is only allowed at the start of a path (like `super`),
 - we can make `$crate` work with inter-crate re-exports (groundwork for macro modularization), and
 - we can support importing macros from an extern crate that is not declared at the crate root (also groundwork for macro modularization).

This is a [breaking-change]. For example, the following would break:
```rust
fn foo() {}
macro_rules! m { () => {
    $crate foo $crate () $crate $crate;
    //^ Today, `$crate` is allowed just about anywhere in unexported macros.
} }
fn main() {
    m!();
}
```
r? @nrc
Loading status checks…
cfc9b51
@bors

@bors bors merged commit 8b0c292 into rust-lang:master Oct 19, 2016
1 check passed

1 check passed

homu Test successful
Details

@bluss bluss added the relnotes label Oct 19, 2016

@jseyfried jseyfried deleted the jseyfried:refactor_crate_var branch Oct 19, 2016

@mcarton mcarton referenced this pull request Oct 22, 2016

Merged

Rustup to *rustc 1.14.0-nightly (f09420685 2016-10-20)* and bump to 0.0.96 #1287

This was referenced Oct 22, 2016

Closed
Closed

@jseyfried jseyfried referenced this pull request Oct 25, 2016

Open

Tracking issue for `use $crate;` compatibility warning #37390

This was referenced Nov 7, 2016

Closed
Merged

bors added a commit that referenced this pull request Nov 10, 2016

@bors
Auto merge of #37645 - jseyfried:fix_crate_var_in_custom_derives, r=nrc 
Fix regression involving custom derives on items with `$crate`

The regression was introduced in #37213.

I believe we cannot make the improvements from #37213 work with the current custom derive setup (c.f. #37637 (comment)) -- we'll have to wait for `TokenStream`'s API to improve.

Fixes #37637.
r? @nrc
Loading status checks…
3dced6f

@jseyfried jseyfried referenced this pull request Dec 5, 2016

Closed

Miscellaneous cleanup/refactoring in `resolve` and `syntax::ext` #38171

@jseyfried jseyfried referenced this pull request Feb 7, 2017

Closed

Tracking issue for "macro naming and modularisation" (RFC #1561) #35896

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.