From 968633b60ad7f2fd0c5663e92b06f2c9d21964a8 Mon Sep 17 00:00:00 2001 From: Flavio Percoco Date: Wed, 5 Feb 2014 22:15:24 +0100 Subject: Replace `crate` usage with `krate` This patch replaces all `crate` usage with `krate` before introducing the new keyword. This ensures that after introducing the keyword, there won't be any compilation errors. krate might not be the most expressive substitution for crate but it's a very close abbreviation for it. `module` was already used in several places already. --- src/libsyntax/ext/base.rs | 2 +- src/libsyntax/ext/expand.rs | 18 +++++++++--------- src/libsyntax/ext/registrar.rs | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/libsyntax/ext') diff --git a/src/libsyntax/ext/base.rs b/src/libsyntax/ext/base.rs index d22a1d697fc..5e3cd2d5016 100644 --- a/src/libsyntax/ext/base.rs +++ b/src/libsyntax/ext/base.rs @@ -268,7 +268,7 @@ pub struct MacroCrate { } pub trait CrateLoader { - fn load_crate(&mut self, crate: &ast::ViewItem) -> MacroCrate; + fn load_crate(&mut self, krate: &ast::ViewItem) -> MacroCrate; fn get_exported_macros(&mut self, crate_num: ast::CrateNum) -> ~[~str]; fn get_registrar_symbol(&mut self, crate_num: ast::CrateNum) -> Option<~str>; } diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index d146cd4dae3..7e327dd520c 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -413,10 +413,10 @@ pub fn expand_view_item(vi: &ast::ViewItem, noop_fold_view_item(vi, fld) } -fn load_extern_macros(crate: &ast::ViewItem, fld: &mut MacroExpander) { - let MacroCrate { lib, cnum } = fld.cx.loader.load_crate(crate); +fn load_extern_macros(krate: &ast::ViewItem, fld: &mut MacroExpander) { + let MacroCrate { lib, cnum } = fld.cx.loader.load_crate(krate); - let crate_name = match crate.node { + let crate_name = match krate.node { ast::ViewItemExternMod(ref name, _, _) => { let string = token::get_ident(name.name); string.get().to_str() @@ -452,19 +452,19 @@ fn load_extern_macros(crate: &ast::ViewItem, fld: &mut MacroExpander) { // this is fatal: there are almost certainly macros we need // inside this crate, so continue would spew "macro undefined" // errors - Err(err) => fld.cx.span_fatal(crate.span, err) + Err(err) => fld.cx.span_fatal(krate.span, err) }; unsafe { let registrar: MacroCrateRegistrationFun = match lib.symbol(registrar) { Ok(registrar) => registrar, // again fatal if we can't register macros - Err(err) => fld.cx.span_fatal(crate.span, err) + Err(err) => fld.cx.span_fatal(krate.span, err) }; registrar(|name, extension| { let extension = match extension { - NormalTT(ext, _) => NormalTT(ext, Some(crate.span)), - IdentTT(ext, _) => IdentTT(ext, Some(crate.span)), + NormalTT(ext, _) => NormalTT(ext, Some(krate.span)), + IdentTT(ext, _) => IdentTT(ext, Some(krate.span)), ItemDecorator(ext) => ItemDecorator(ext), }; fld.extsbox.insert(name, extension); @@ -1032,10 +1032,10 @@ mod test { } } - //fn fake_print_crate(crate: &ast::Crate) { + //fn fake_print_crate(krate: &ast::Crate) { // let mut out = ~std::io::stderr() as ~std::io::Writer; // let mut s = pprust::rust_printer(out, get_ident_interner()); - // pprust::print_crate_(&mut s, crate); + // pprust::print_crate_(&mut s, krate); //} fn expand_crate_str(crate_str: ~str) -> ast::Crate { diff --git a/src/libsyntax/ext/registrar.rs b/src/libsyntax/ext/registrar.rs index e831e8fbb10..f0bad1b40eb 100644 --- a/src/libsyntax/ext/registrar.rs +++ b/src/libsyntax/ext/registrar.rs @@ -35,16 +35,16 @@ impl Visitor<()> for MacroRegistrarContext { } pub fn find_macro_registrar(diagnostic: @diagnostic::SpanHandler, - crate: &ast::Crate) -> Option { + krate: &ast::Crate) -> Option { let mut ctx = MacroRegistrarContext { registrars: ~[] }; - visit::walk_crate(&mut ctx, crate, ()); + visit::walk_crate(&mut ctx, krate, ()); match ctx.registrars.len() { 0 => None, 1 => { let (node_id, _) = ctx.registrars.pop().unwrap(); Some(ast::DefId { - crate: ast::LOCAL_CRATE, + krate: ast::LOCAL_CRATE, node: node_id }) }, -- cgit 1.4.1-3-g733a5