Skip to content

Commit 28c1136

Browse files
authored
Rollup merge of #65916 - Centril:split-syntax-3, r=davidtwco
syntax: move stuff around Part of #65324. r? @davidtwco cc @estebank @petrochenkov
2 parents 59e79ff + cc9c139 commit 28c1136

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+169
-150
lines changed

src/librustc/hir/lowering.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ use syntax::ptr::P as AstP;
6666
use syntax::ast::*;
6767
use syntax::errors;
6868
use syntax::print::pprust;
69-
use syntax::parse::token::{self, Nonterminal, Token};
69+
use syntax::token::{self, Nonterminal, Token};
7070
use syntax::tokenstream::{TokenStream, TokenTree};
7171
use syntax::sess::ParseSess;
7272
use syntax::source_map::{respan, ExpnData, ExpnKind, DesugaringKind, Spanned};

src/librustc/hir/map/def_collector.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use crate::hir::def_id::DefIndex;
44
use syntax::ast::*;
55
use syntax::visit;
66
use syntax::symbol::{kw, sym};
7-
use syntax::parse::token::{self, Token};
7+
use syntax::token::{self, Token};
88
use syntax_pos::hygiene::ExpnId;
99
use syntax_pos::Span;
1010

src/librustc/ich/impls_syntax.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ use std::mem;
88

99
use syntax::ast;
1010
use syntax::feature_gate;
11-
use syntax::parse::token;
12-
use syntax::symbol::SymbolStr;
11+
use syntax::token;
1312
use syntax::tokenstream;
13+
use syntax_pos::symbol::SymbolStr;
1414
use syntax_pos::SourceFile;
1515

1616
use crate::hir::def_id::{DefId, CrateNum, CRATE_DEF_INDEX};

src/librustc_driver/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ use rustc::ty::TyCtxt;
4242
use rustc::util::common::{set_time_depth, time, print_time_passes_entry, ErrorReported};
4343
use rustc_metadata::locator;
4444
use rustc_codegen_utils::codegen_backend::CodegenBackend;
45+
use errors::PResult;
4546
use rustc_interface::interface;
4647
use rustc_interface::util::get_codegen_sysroot;
4748
use rustc_data_structures::sync::SeqCst;
@@ -64,7 +65,7 @@ use std::time::Instant;
6465
use syntax::ast;
6566
use syntax::source_map::FileLoader;
6667
use syntax::feature_gate::{GatedCfg, UnstableFeatures};
67-
use syntax::parse::{self, PResult};
68+
use syntax::parse;
6869
use syntax::symbol::sym;
6970
use syntax_pos::{DUMMY_SP, FileName};
7071

src/librustc_errors/lib.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ use Level::*;
1515

1616
use emitter::{Emitter, EmitterWriter, is_case_difference};
1717
use registry::Registry;
18-
18+
#[cfg(target_arch = "x86_64")]
19+
use rustc_data_structures::static_assert_size;
1920
use rustc_data_structures::sync::{self, Lrc, Lock};
2021
use rustc_data_structures::fx::{FxHashSet, FxIndexMap};
2122
use rustc_data_structures::stable_hasher::StableHasher;
@@ -48,6 +49,13 @@ use syntax_pos::{
4849
SpanSnippetError,
4950
};
5051

52+
pub type PResult<'a, T> = Result<T, DiagnosticBuilder<'a>>;
53+
54+
// `PResult` is used a lot. Make sure it doesn't unintentionally get bigger.
55+
// (See also the comment on `DiagnosticBuilderInner`.)
56+
#[cfg(target_arch = "x86_64")]
57+
static_assert_size!(PResult<'_, bool>, 16);
58+
5159
/// Indicates the confidence in the correctness of a suggestion.
5260
///
5361
/// All suggestions are marked with an `Applicability`. Tools use the applicability of a suggestion

src/librustc_interface/interface.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use std::result;
1616
use std::sync::{Arc, Mutex};
1717
use syntax::{self, parse};
1818
use syntax::ast::{self, MetaItemKind};
19-
use syntax::parse::token;
19+
use syntax::token;
2020
use syntax::source_map::{FileName, FileLoader, SourceMap};
2121
use syntax::sess::ParseSess;
2222
use syntax_pos::edition;

src/librustc_interface/passes.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ use rustc_codegen_utils::codegen_backend::CodegenBackend;
2222
use rustc_codegen_utils::link::filename_for_metadata;
2323
use rustc_data_structures::{box_region_allow_access, declare_box_region_type, parallel};
2424
use rustc_data_structures::sync::{Lrc, ParallelIterator, par_iter};
25+
use rustc_errors::PResult;
2526
use rustc_incremental;
2627
use rustc_metadata::cstore;
2728
use rustc_mir as mir;
@@ -36,7 +37,7 @@ use syntax::{self, ast, visit};
3637
use syntax::early_buffered_lints::BufferedEarlyLint;
3738
use syntax_expand::base::{NamedSyntaxExtension, ExtCtxt};
3839
use syntax::mut_visit::MutVisitor;
39-
use syntax::parse::{self, PResult};
40+
use syntax::parse;
4041
use syntax::util::node_count::NodeCounter;
4142
use syntax::symbol::Symbol;
4243
use syntax_pos::FileName;

src/librustc_resolve/build_reduced_graph.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use syntax::attr;
3333
use syntax::ast::{self, Block, ForeignItem, ForeignItemKind, Item, ItemKind, NodeId};
3434
use syntax::ast::{MetaItemKind, StmtKind, TraitItem, TraitItemKind};
3535
use syntax::feature_gate::is_builtin_attr;
36-
use syntax::parse::token::{self, Token};
36+
use syntax::token::{self, Token};
3737
use syntax::print::pprust;
3838
use syntax::{span_err, struct_span_err};
3939
use syntax::source_map::{respan, Spanned};

src/librustc_save_analysis/dump_visitor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ use std::path::Path;
2424
use std::env;
2525

2626
use syntax::ast::{self, Attribute, NodeId, PatKind};
27-
use syntax::parse::token;
27+
use syntax::token;
2828
use syntax::visit::{self, Visitor};
2929
use syntax::print::pprust::{
3030
bounds_to_string,

src/librustc_save_analysis/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use std::path::{Path, PathBuf};
2929

3030
use syntax::ast::{self, Attribute, DUMMY_NODE_ID, NodeId, PatKind};
3131
use syntax::source_map::Spanned;
32-
use syntax::parse::lexer::comments::strip_doc_comment_decoration;
32+
use syntax::util::comments::strip_doc_comment_decoration;
3333
use syntax::print::pprust;
3434
use syntax::visit::{self, Visitor};
3535
use syntax::print::pprust::{param_to_string, ty_to_string};

0 commit comments

Comments
 (0)