macros: improve reexports #37463

jseyfried · 2016-10-29T07:28:16Z

This PR

fixes $crate in #[macro_reexport]ed macros,
- [breaking-change] for #[feature(macro_reexport)] (technically)
stability checks #[no_link] extern crates,
- [breaking-chage]: #[no_link] #[macro_use] extern crate syntax; is allowed on stable today
allows selective macro importing (i.e. #[macro_use(foo, bar)]) from custom derive crates,
avoids building multiple module graphs for a crate that is referenced by multiple extern crate items,
registers #[no_link] extern crates to avoid loading the same crate metadata twice, and
refactors the crate metadata to support re-exported macros in arbitrary modules (not yet needed).

jseyfried · 2016-10-29T07:34:36Z

eddyb · 2016-10-29T07:43:41Z

src/librustc_metadata/encoder.rs

+            name: macro_def.name,
+            attrs: macro_def.attrs.to_vec(),
+            span: macro_def.span,
+            body: ::syntax::print::pprust::tts_to_string(&macro_def.body)


We should just encode the raw tokens - which would get us proper spans from the original source.

Agreed, but I'd rather change that in a separate PR.

bors · 2016-10-30T17:15:33Z

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

nrc · 2016-11-07T01:51:35Z

src/librustc_metadata/decoder.rs

+                if let Def::Macro(..) = exp.def {
+                } else if macros_only {
+                    continue
+                }


This would be clearer using else if !macros_only { callback(exp) } and/or using a match rather than if let

I'll use a match.

nrc · 2016-11-07T01:52:55Z

src/librustc_resolve/lib.rs

@@ -533,6 +533,7 @@ impl PatternSource {
 pub enum Namespace {
    TypeNS,
    ValueNS,
+    MacroNS,


I'd prefer to use a qualified name rather than have this NS suffix on each variant, but not essential to landing

nrc · 2016-11-07T02:06:49Z

src/librustc/hir/map/collector.rs

@@ -226,4 +226,8 @@ impl<'ast> Visitor<'ast> for NodeCollector<'ast> {
    fn visit_lifetime(&mut self, lifetime: &'ast Lifetime) {
        self.insert(lifetime.id, NodeLifetime(lifetime));
    }
+
+    fn visit_macro_def(&mut self, macro_def: &'ast MacroDef) {
+        self.insert_entry(macro_def.id, NotPresent);


Why do we record macros in the HIR and start with HIR to make the metadata? I'd have thought the HIR should be totally ignorant of macros and we could generate metadata from the AST.

The AST is no longer around when we generate metadata.

If we don't want to include exported macros in the HIR, I think the best alternative would be to move the AST's exported macros into a local in driver::compile_input and pass them directly to the metadata encoder.

Don't see any improvement from that. OTOH, HIR is nicer for incremental recompilation.

bors · 2016-11-07T07:08:55Z

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

jseyfried · 2016-11-07T23:20:19Z

@bors r=nrc

bors · 2016-11-07T23:20:20Z

📌 Commit 57d781d has been approved by nrc

bors · 2016-11-07T23:21:37Z

⌛ Testing commit 57d781d with merge 8840d92...

bors · 2016-11-07T23:25:25Z

💔 Test failed - auto-linux-cross-opt

jseyfried · 2016-11-08T21:35:02Z

@bors r=nrc

bors · 2016-11-08T21:35:03Z

📌 Commit f967566 has been approved by nrc

Rollup of 15 pull requests - Successful merges: #36868, #37134, #37229, #37250, #37370, #37428, #37432, #37472, #37524, #37614, #37622, #37627, #37636, #37644, #37654 - Failed merges: #37463, #37542, #37645

that is referenced by multiple `extern crate` items.

jseyfried · 2016-11-10T09:27:23Z

@bors r=nrc

bors · 2016-11-10T09:27:24Z

📌 Commit b2fa1b6 has been approved by nrc

bors · 2016-11-10T09:45:18Z

⌛ Testing commit b2fa1b6 with merge 8510b2e...

bors · 2016-11-10T09:59:17Z

💔 Test failed - auto-win-gnu-32-opt-rustbuild

jseyfried · 2016-11-10T10:05:41Z

@bors r=nrc

bors · 2016-11-10T10:05:44Z

📌 Commit a0a9f8c has been approved by nrc

bors · 2016-11-10T10:05:46Z

⌛ Testing commit a0a9f8c with merge ab03f85...

@nrc

macros: improve reexports This PR - avoids building multiple module graphs for a crate that is referenced by multiple `extern crate` items, - registers `#[no_link] extern crate`s to avoid loading the same crate metadata twice, - stability checks `#[no_link] extern crate`s, - [breaking-chage]: `#[no_link] #[macro_use] extern crate syntax;` is allowed on stable today - fixes `$crate` in `#[macro_reexport]`ed macros, - [breaking-change] for `#[feature(macro_reexport)]` (technically) - allows selective macro importing (i.e. `#[macro_use(foo, bar)]`) from custom derive crates, and - refactors the crate metadata to support re-exported macros in arbitrary modules (not yet needed). r? @nrc

bors · 2016-11-10T13:10:02Z

rustc_metadata: don't break the version check when CrateRoot changes. In #36551 I made `rustc_version` a field of `CrateRoot`, but despite it being the first field, one could still break the version check by changing `CrateRoot` so older compilers couldn't fully decode it (e.g. #37463). This PR fixes #37803 by moving the version string back at the beginning of metadata, right after the 32-bit big-endian absolute position of `CrateRoot`, and by incrementing `METADATA_VERSION`.

rust-highfive assigned nrc Oct 29, 2016

jseyfried force-pushed the refactor_macro_reexports branch from 670dde0 to 6a83458 Compare October 29, 2016 07:31

jseyfried force-pushed the refactor_macro_reexports branch from 6a83458 to 70eca75 Compare October 29, 2016 07:40

eddyb reviewed Oct 29, 2016

View reviewed changes

jseyfried force-pushed the refactor_macro_reexports branch 4 times, most recently from 9399bd2 to ea80c32 Compare October 30, 2016 09:08

jseyfried force-pushed the refactor_macro_reexports branch from ea80c32 to b0babc8 Compare October 30, 2016 21:55

jseyfried mentioned this pull request Nov 2, 2016

Support #[macro_reexport]ing custom derives #37542

Merged

jseyfried force-pushed the refactor_macro_reexports branch 2 times, most recently from b3bb0a7 to bac13dc Compare November 5, 2016 20:11

nrc approved these changes Nov 7, 2016

View reviewed changes

jseyfried force-pushed the refactor_macro_reexports branch 3 times, most recently from ed42dfc to 57d781d Compare November 7, 2016 22:38

jseyfried force-pushed the refactor_macro_reexports branch from 57d781d to f967566 Compare November 8, 2016 05:16

eddyb mentioned this pull request Nov 9, 2016

Rollup of 15 pull requests #37670

Merged

jseyfried force-pushed the refactor_macro_reexports branch from f967566 to 3d760d7 Compare November 10, 2016 06:07

jseyfried added 5 commits November 10, 2016 09:20

Avoid building multiple reduced graphs for a crate

624a9b7

that is referenced by multiple `extern crate` items.

Clean up CrateSource.

c102d7f

Refactor explicitly_linked: bool -> dep_kind: DepKind.

a1d45d9

Register and stability check #[no_link] crates.

dd0781e

Add variants Def::Macro and Namespace::MacroNS.

85f74c0

jseyfried force-pushed the refactor_macro_reexports branch from 3d760d7 to b2fa1b6 Compare November 10, 2016 09:23

jseyfried added 2 commits November 10, 2016 10:04

Improve macro reexports.

872943c

Fix fallout in librustdoc.

a0a9f8c

jseyfried force-pushed the refactor_macro_reexports branch from b2fa1b6 to a0a9f8c Compare November 10, 2016 10:05

bors merged commit a0a9f8c into rust-lang:master Nov 10, 2016

This was referenced Nov 10, 2016

[7/n] rustc: desugar UFCS in HIR and don't use DefMap for associated resolutions. #37676

Merged

rustc: Implement #[link(cfg(..))] and crt-static #37545

Merged

jseyfried deleted the refactor_macro_reexports branch November 11, 2016 02:53

jseyfried mentioned this pull request Nov 22, 2016

rustc index out of bounds libserialize\leb128.rs #37803

Closed

eddyb mentioned this pull request Nov 22, 2016

rustc_metadata: don't break the version check when CrateRoot changes. #37931

Merged

jseyfried mentioned this pull request Feb 7, 2017

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

Closed

This was referenced Feb 27, 2017

Simplify TokenTree and fix macro_rules! bugs #39419

Merged

Macros 1.2: Fast-track to stabilize function-like procedural macros rust-lang/rfcs#1913

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

macros: improve reexports #37463

macros: improve reexports #37463

jseyfried commented Oct 29, 2016 •

edited

Loading

jseyfried commented Oct 29, 2016 •

edited

Loading

eddyb Oct 29, 2016

jseyfried Oct 29, 2016

bors commented Oct 30, 2016

nrc Nov 7, 2016

jseyfried Nov 7, 2016

nrc Nov 7, 2016

nrc Nov 7, 2016

jseyfried Nov 7, 2016 •

edited

Loading

eddyb Nov 7, 2016

bors commented Nov 7, 2016

jseyfried commented Nov 7, 2016

bors commented Nov 7, 2016

bors commented Nov 7, 2016

bors commented Nov 7, 2016

jseyfried commented Nov 8, 2016

bors commented Nov 8, 2016

jseyfried commented Nov 10, 2016

bors commented Nov 10, 2016

bors commented Nov 10, 2016

bors commented Nov 10, 2016

jseyfried commented Nov 10, 2016

bors commented Nov 10, 2016

bors commented Nov 10, 2016

bors commented Nov 10, 2016

macros: improve reexports #37463

macros: improve reexports #37463

Conversation

jseyfried commented Oct 29, 2016 • edited Loading

jseyfried commented Oct 29, 2016 • edited Loading

eddyb Oct 29, 2016

Choose a reason for hiding this comment

jseyfried Oct 29, 2016

Choose a reason for hiding this comment

bors commented Oct 30, 2016

nrc Nov 7, 2016

Choose a reason for hiding this comment

jseyfried Nov 7, 2016

Choose a reason for hiding this comment

nrc Nov 7, 2016

Choose a reason for hiding this comment

nrc Nov 7, 2016

Choose a reason for hiding this comment

jseyfried Nov 7, 2016 • edited Loading

Choose a reason for hiding this comment

eddyb Nov 7, 2016

Choose a reason for hiding this comment

bors commented Nov 7, 2016

jseyfried commented Nov 7, 2016

bors commented Nov 7, 2016

bors commented Nov 7, 2016

bors commented Nov 7, 2016

jseyfried commented Nov 8, 2016

bors commented Nov 8, 2016

jseyfried commented Nov 10, 2016

bors commented Nov 10, 2016

bors commented Nov 10, 2016

bors commented Nov 10, 2016

jseyfried commented Nov 10, 2016

bors commented Nov 10, 2016

bors commented Nov 10, 2016

bors commented Nov 10, 2016

jseyfried commented Oct 29, 2016 •

edited

Loading

jseyfried commented Oct 29, 2016 •

edited

Loading

jseyfried Nov 7, 2016 •

edited

Loading