mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #33378 - oli-obk:fix/registry_args, r=Manishearth

Browse Source 
fix Registry::args for plugins loaded with --extra-plugins

r? @Manishearth
This commit is contained in:
bors 2016-05-20 08:44:01 -07:00
commit 0352866da7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/librustc_plugin/registry.rs
View File

@ -92,8 +92,11 @@ impl<'a> Registry<'a> {
/// ```no_run
/// #![plugin(my_plugin_name(... args ...))]
/// ```
pub fn args<'b>(&'b self) -> &'b Vec<P<ast::MetaItem>> {
self.args_hidden.as_ref().expect("args not set")
///
/// Returns empty slice in case the plugin was loaded
/// with `--extra-plugins`
pub fn args<'b>(&'b self) -> &'b [P<ast::MetaItem>] {
self.args_hidden.as_ref().map(|v| &v[..]).unwrap_or(&[])
}
/// Register a syntax extension of any kind.

2
src/test/run-pass-fulldeps/auxiliary/plugin_args.rs
View File

@ -45,7 +45,7 @@ impl TTMacroExpander for Expander {
#[plugin_registrar]
pub fn plugin_registrar(reg: &mut Registry) {
let args = reg.args().clone();
let args = reg.args().to_owned();
reg.register_syntax_extension(token::intern("plugin_args"),
// FIXME (#22405): Replace `Box::new` with `box` here when/if possible.
NormalTT(Box::new(Expander { args: args, }), None, false));