user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Normalize syntax::source_map imports.

Browse source
This commit is contained in:
Mazdak Farrokhzad 2020-01-01 19:25:28 +01:00
parent 766fba3fdc
commit 75e4783f63
83 changed files with 122 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/libsyntax/print/pprust.rs
View file

@ -6,7 +6,6 @@ use crate::print::pp::Breaks::{Consistent, Inconsistent};
use crate::print::pp::{self, Breaks};
use crate::ptr::P;
use crate::sess::ParseSess;
use crate::source_map::{self, SourceMap, Spanned};
use crate::symbol::{kw, sym};
use crate::token::{self, BinOpToken, DelimToken, Nonterminal, Token, TokenKind};
use crate::tokenstream::{self, TokenStream, TokenTree};
@ -14,8 +13,8 @@ use crate::util::classify;
use crate::util::comments;
use crate::util::parser::{self, AssocOp, Fixity};
use rustc_span::{self, BytePos};
use rustc_span::{FileName, Span};
use rustc_span::source_map::{dummy_spanned, SourceMap, Spanned};
use rustc_span::{BytePos, FileName, Span};
use std::borrow::Cow;
@ -2709,7 +2708,7 @@ impl<'a> State<'a> {
ast::FnHeader { unsafety, ext, ..ast::FnHeader::default() },
name,
&generics,
&source_map::dummy_spanned(ast::VisibilityKind::Inherited),
&dummy_spanned(ast::VisibilityKind::Inherited),
);
self.end();
}

6
src/libsyntax/print/pprust/tests.rs
View file

@ -1,9 +1,9 @@
use super::*;
use crate::ast;
use crate::source_map;
use crate::with_default_globals;
use rustc_span;
use rustc_span::source_map::{dummy_spanned, respan};
fn fun_to_string(
decl: &ast::FnDecl,
@ -18,7 +18,7 @@ fn fun_to_string(
header,
Some(name),
generics,
&source_map::dummy_spanned(ast::VisibilityKind::Inherited),
&dummy_spanned(ast::VisibilityKind::Inherited),
);
s.end(); // Close the head box.
s.end(); // Close the outer box.
@ -53,7 +53,7 @@ fn test_variant_to_string() {
let var = ast::Variant {
ident,
vis: source_map::respan(rustc_span::DUMMY_SP, ast::VisibilityKind::Inherited),
vis: respan(rustc_span::DUMMY_SP, ast::VisibilityKind::Inherited),
attrs: Vec::new(),
id: ast::DUMMY_NODE_ID,
data: ast::VariantData::Unit(ast::DUMMY_NODE_ID),