diff options
| author | bors <bors@rust-lang.org> | 2017-04-14 23:15:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-14 23:15:31 +0000 |
| commit | f0ca5d4bad07a4fc8497bd9766cdadaee1bd0ac6 (patch) | |
| tree | 1bfb55b7dd4b44c68a4a237deb0ebd22685f5efc /src/libsyntax_ext/lib.rs | |
| parent | bbdaad0dc8dc64e036ccee817f90a91876b32a9d (diff) | |
| parent | 13dc855cc334ce4104e05dc239b0bf8b402609ce (diff) | |
| download | rust-f0ca5d4bad07a4fc8497bd9766cdadaee1bd0ac6.tar.gz rust-f0ca5d4bad07a4fc8497bd9766cdadaee1bd0ac6.zip | |
Auto merge of #41305 - frewsxcv:rollup, r=frewsxcv
Rollup of 4 pull requests - Successful merges: #40702, #41172, #41249, #41303 - Failed merges:
Diffstat (limited to 'src/libsyntax_ext/lib.rs')
| -rw-r--r-- | src/libsyntax_ext/lib.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libsyntax_ext/lib.rs b/src/libsyntax_ext/lib.rs index 1e9b112b6df..e35e79df585 100644 --- a/src/libsyntax_ext/lib.rs +++ b/src/libsyntax_ext/lib.rs @@ -38,6 +38,7 @@ mod concat_idents; mod env; mod format; mod format_foreign; +mod global_asm; mod log_syntax; mod trace_macros; @@ -99,6 +100,7 @@ pub fn register_builtins(resolver: &mut syntax::ext::base::Resolver, module_path: expand_mod, asm: asm::expand_asm, + global_asm: global_asm::expand_global_asm, cfg: cfg::expand_cfg, concat: concat::expand_syntax_ext, concat_idents: concat_idents::expand_syntax_ext, |