Skip to content

Commit 6136495

Browse files
committedSep 3, 2019
use consistent naming for buildin expansion functions
1 parent fa893a3 commit 6136495

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed
 

‎src/libsyntax_ext/concat.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use syntax::tokenstream::TokenStream;
55

66
use std::string::String;
77

8-
pub fn expand_syntax_ext(
8+
pub fn expand_concat(
99
cx: &mut base::ExtCtxt<'_>,
1010
sp: syntax_pos::Span,
1111
tts: TokenStream,

‎src/libsyntax_ext/concat_idents.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ use syntax_pos::Span;
88
use syntax_pos::symbol::Symbol;
99
use syntax::tokenstream::{TokenTree, TokenStream};
1010

11-
pub fn expand_syntax_ext<'cx>(cx: &'cx mut ExtCtxt<'_>,
12-
sp: Span,
13-
tts: TokenStream)
14-
-> Box<dyn base::MacResult + 'cx> {
11+
pub fn expand_concat_idents<'cx>(cx: &'cx mut ExtCtxt<'_>,
12+
sp: Span,
13+
tts: TokenStream)
14+
-> Box<dyn base::MacResult + 'cx> {
1515
if tts.is_empty() {
1616
cx.span_err(sp, "concat_idents! takes 1 or more arguments.");
1717
return DummyResult::any(sp);

‎src/libsyntax_ext/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ pub fn register_builtin_macros(resolver: &mut dyn syntax::ext::base::Resolver, e
6767
cfg: cfg::expand_cfg,
6868
column: source_util::expand_column,
6969
compile_error: compile_error::expand_compile_error,
70-
concat_idents: concat_idents::expand_syntax_ext,
71-
concat: concat::expand_syntax_ext,
70+
concat_idents: concat_idents::expand_concat_idents,
71+
concat: concat::expand_concat,
7272
env: env::expand_env,
7373
file: source_util::expand_file,
7474
format_args_nl: format::expand_format_args_nl,
@@ -78,7 +78,7 @@ pub fn register_builtin_macros(resolver: &mut dyn syntax::ext::base::Resolver, e
7878
include_str: source_util::expand_include_str,
7979
include: source_util::expand_include,
8080
line: source_util::expand_line,
81-
log_syntax: log_syntax::expand_syntax_ext,
81+
log_syntax: log_syntax::expand_log_syntax,
8282
module_path: source_util::expand_mod,
8383
option_env: env::expand_option_env,
8484
stringify: source_util::expand_stringify,

‎src/libsyntax_ext/log_syntax.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use syntax::print;
33
use syntax::tokenstream::TokenStream;
44
use syntax_pos;
55

6-
pub fn expand_syntax_ext<'cx>(_cx: &'cx mut base::ExtCtxt<'_>,
6+
pub fn expand_log_syntax<'cx>(_cx: &'cx mut base::ExtCtxt<'_>,
77
sp: syntax_pos::Span,
88
tts: TokenStream)
99
-> Box<dyn base::MacResult + 'cx> {

0 commit comments

Comments
 (0)
Please sign in to comment.