Skip to content

Commit 24a491f

Browse files
committedAug 5, 2019
Drop explicit span argument from mk_name_value_item
1 parent ab3fb1e commit 24a491f

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed
 

‎src/librustdoc/clean/cfg/tests.rs

-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ fn test_parse_ok() {
211211
fn test_parse_err() {
212212
with_default_globals(|| {
213213
let mi = attr::mk_name_value_item(
214-
DUMMY_SP,
215214
Ident::from_str("foo"),
216215
LitKind::Bool(false),
217216
DUMMY_SP,

‎src/libsyntax/attr/mod.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -347,11 +347,12 @@ impl Attribute {
347347

348348
pub fn mk_name_value_item_str(ident: Ident, value: Spanned<Symbol>) -> MetaItem {
349349
let lit_kind = LitKind::Str(value.node, ast::StrStyle::Cooked);
350-
mk_name_value_item(ident.span.to(value.span), ident, lit_kind, value.span)
350+
mk_name_value_item(ident, lit_kind, value.span)
351351
}
352352

353-
pub fn mk_name_value_item(span: Span, ident: Ident, lit_kind: LitKind, lit_span: Span) -> MetaItem {
353+
pub fn mk_name_value_item(ident: Ident, lit_kind: LitKind, lit_span: Span) -> MetaItem {
354354
let lit = Lit::from_lit_kind(lit_kind, lit_span);
355+
let span = ident.span.to(lit_span);
355356
MetaItem { path: Path::from_ident(ident), span, node: MetaItemKind::NameValue(lit) }
356357
}
357358

‎src/libsyntax/ext/build.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -884,8 +884,7 @@ impl<'a> ExtCtxt<'a> {
884884

885885
pub fn meta_name_value(&self, span: Span, name: ast::Name, lit_kind: ast::LitKind)
886886
-> ast::MetaItem {
887-
attr::mk_name_value_item(span, Ident::new(name, span),
888-
lit_kind, span)
887+
attr::mk_name_value_item(Ident::new(name, span), lit_kind, span)
889888
}
890889

891890
pub fn item_use(&self, sp: Span,

0 commit comments

Comments
 (0)
Please sign in to comment.