diff options
| author | Donato Sciarra <sciarp@gmail.com> | 2018-08-18 12:14:03 +0200 |
|---|---|---|
| committer | Donato Sciarra <sciarp@gmail.com> | 2018-08-19 23:01:00 +0200 |
| commit | 82607d2cf3866c7cc31050548f2fbfa39207e319 (patch) | |
| tree | f55b1efaefb9088df83f268478ba0c8adefd6943 /src/libsyntax_ext/deriving/generic | |
| parent | cbd05957103926fa10d41474fde773167fe64dfb (diff) | |
| download | rust-82607d2cf3866c7cc31050548f2fbfa39207e319.tar.gz rust-82607d2cf3866c7cc31050548f2fbfa39207e319.zip | |
mv (mod) codemap source_map
Diffstat (limited to 'src/libsyntax_ext/deriving/generic')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/ty.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index 2e0ba65dc65..28a2c11ceb1 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -198,7 +198,7 @@ use syntax::ast::{VariantData, GenericParamKind, GenericArg}; use syntax::attr; use syntax::ext::base::{Annotatable, ExtCtxt}; use syntax::ext::build::AstBuilder; -use syntax::codemap::{self, respan}; +use syntax::source_map::{self, respan}; use syntax::util::move_map::MoveMap; use syntax::ptr::P; use syntax::symbol::{Symbol, keywords}; @@ -1619,7 +1619,7 @@ impl<'a> TraitDef<'a> { if ident.is_none() { cx.span_bug(sp, "a braced struct with unnamed fields in `derive`"); } - codemap::Spanned { + source_map::Spanned { span: pat.span.with_ctxt(self.span.ctxt()), node: ast::FieldPat { ident: ident.unwrap(), diff --git a/src/libsyntax_ext/deriving/generic/ty.rs b/src/libsyntax_ext/deriving/generic/ty.rs index a0845e0982d..fa284f4ab0e 100644 --- a/src/libsyntax_ext/deriving/generic/ty.rs +++ b/src/libsyntax_ext/deriving/generic/ty.rs @@ -18,7 +18,7 @@ use syntax::ast; use syntax::ast::{Expr, GenericParamKind, Generics, Ident, SelfKind, GenericArg}; use syntax::ext::base::ExtCtxt; use syntax::ext::build::AstBuilder; -use syntax::codemap::{respan, DUMMY_SP}; +use syntax::source_map::{respan, DUMMY_SP}; use syntax::ptr::P; use syntax_pos::Span; use syntax_pos::symbol::keywords; |
