Skip to content
Permalink
Browse files

Make things build again

  • Loading branch information
petrochenkov committed Dec 29, 2019
1 parent b683de4 commit b9a9c5b4fd9008976b3ddfec8e02d8554f5a722b

Large diffs are not rendered by default.

@@ -9,5 +9,5 @@ name = "fmt_macros"
path = "lib.rs"

[dependencies]
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc_lexer = { path = "../librustc_lexer" }
@@ -30,7 +30,7 @@ rustc_index = { path = "../librustc_index" }
errors = { path = "../librustc_errors", package = "rustc_errors" }
rustc_serialize = { path = "../libserialize", package = "serialize" }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
backtrace = "0.3.40"
parking_lot = "0.9"
byteorder = { version = "1.3" }
@@ -1,11 +1,11 @@
[package]
authors = ["The Rust Project Developers"]
name = "syntax_ext"
name = "rustc_builtin_macros"
version = "0.0.0"
edition = "2018"

[lib]
name = "syntax_ext"
name = "rustc_builtin_macros"
path = "lib.rs"
doctest = false

@@ -19,6 +19,6 @@ rustc_parse = { path = "../librustc_parse" }
rustc_target = { path = "../librustc_target" }
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
syntax = { path = "../libsyntax" }
syntax_expand = { path = "../libsyntax_expand" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_expand = { path = "../librustc_expand", package = "rustc_expand" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc_error_codes = { path = "../librustc_error_codes" }
@@ -412,8 +412,8 @@ impl<'a> TraitDef<'a> {
_ => {
// Non-ADT derive is an error, but it should have been
// set earlier; see
// libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
// libsyntax_expand/base.rs:Annotatable::derive_allowed()
// librustc_expand/expand.rs:MacroExpander::fully_expand_fragment()
// librustc_expand/base.rs:Annotatable::derive_allowed()
return;
}
};
@@ -487,8 +487,8 @@ impl<'a> TraitDef<'a> {
_ => {
// Non-Item derive is an error, but it should have been
// set earlier; see
// libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
// libsyntax_expand/base.rs:Annotatable::derive_allowed()
// librustc_expand/expand.rs:MacroExpander::fully_expand_fragment()
// librustc_expand/base.rs:Annotatable::derive_allowed()
return;
}
}
@@ -92,8 +92,8 @@ fn inject_impl_of_structural_trait(
_ => {
// Non-Item derive is an error, but it should have been
// set earlier; see
// libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
// libsyntax_expand/base.rs:Annotatable::derive_allowed()
// librustc_expand/expand.rs:MacroExpander::fully_expand_fragment()
// librustc_expand/base.rs:Annotatable::derive_allowed()
return;
}
};
@@ -30,5 +30,5 @@ rustc_session = { path = "../librustc_session" }
rustc_target = { path = "../librustc_target" }
smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }
syntax = { path = "../libsyntax" }
syntax_expand = { path = "../libsyntax_expand" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_expand = { path = "../librustc_expand", package = "rustc_expand" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
@@ -21,7 +21,7 @@ tempfile = "3.1"

rustc_serialize = { path = "../libserialize", package = "serialize" }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc = { path = "../librustc" }
rustc_apfloat = { path = "../librustc_apfloat" }
rustc_codegen_utils = { path = "../librustc_codegen_utils" }
@@ -15,7 +15,7 @@ punycode = "0.4.0"
rustc-demangle = "0.1.16"

syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc = { path = "../librustc" }
rustc_target = { path = "../librustc_target" }
rustc_data_structures = { path = "../librustc_data_structures" }
@@ -31,7 +31,7 @@ rustc_interface = { path = "../librustc_interface" }
rustc_serialize = { path = "../libserialize", package = "serialize" }
rustc_resolve = { path = "../librustc_resolve" }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }

[features]
llvm = ['rustc_interface/llvm']
@@ -12,7 +12,7 @@ doctest = false
[dependencies]
log = "0.4"
rustc_serialize = { path = "../libserialize", package = "serialize" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc_data_structures = { path = "../librustc_data_structures" }
unicode-width = "0.1.4"
atty = "0.2"
@@ -1,19 +1,19 @@
[package]
authors = ["The Rust Project Developers"]
name = "syntax_expand"
name = "rustc_expand"
version = "0.0.0"
edition = "2018"
build = false

[lib]
name = "syntax_expand"
name = "rustc_expand"
path = "lib.rs"
doctest = false

[dependencies]
rustc_serialize = { path = "../libserialize", package = "serialize" }
log = "0.4"
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
errors = { path = "../librustc_errors", package = "rustc_errors" }
rustc_data_structures = { path = "../librustc_data_structures" }
rustc_feature = { path = "../librustc_feature" }
@@ -12,4 +12,4 @@ doctest = false
[dependencies]
rustc_data_structures = { path = "../librustc_data_structures" }
lazy_static = "1.0.0"
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
@@ -17,6 +17,6 @@ rustc = { path = "../librustc" }
rustc_data_structures = { path = "../librustc_data_structures" }
rustc_serialize = { path = "../libserialize", package = "serialize" }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc_fs_util = { path = "../librustc_fs_util" }
rustc_session = { path = "../librustc_session" }
@@ -14,10 +14,10 @@ log = "0.4"
rayon = { version = "0.3.0", package = "rustc-rayon" }
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
syntax = { path = "../libsyntax" }
syntax_ext = { path = "../libsyntax_ext" }
syntax_expand = { path = "../libsyntax_expand" }
syntax_ext = { path = "../librustc_builtin_macros", package = "rustc_builtin_macros" }
syntax_expand = { path = "../librustc_expand", package = "rustc_expand" }
rustc_parse = { path = "../librustc_parse" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc_serialize = { path = "../libserialize", package = "serialize" }
rustc = { path = "../librustc" }
rustc_incremental = { path = "../librustc_incremental" }
@@ -13,7 +13,7 @@ log = "0.4"
rustc = { path = "../librustc" }
rustc_target = { path = "../librustc_target" }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc_data_structures = { path = "../librustc_data_structures" }
rustc_feature = { path = "../librustc_feature" }
rustc_index = { path = "../librustc_index" }
@@ -22,7 +22,7 @@ rustc_index = { path = "../librustc_index" }
rustc_serialize = { path = "../libserialize", package = "serialize" }
stable_deref_trait = "1.0.0"
syntax = { path = "../libsyntax" }
syntax_expand = { path = "../libsyntax_expand" }
syntax_expand = { path = "../librustc_expand", package = "rustc_expand" }
rustc_parse = { path = "../librustc_parse" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc_error_codes = { path = "../librustc_error_codes" }
@@ -637,7 +637,7 @@ impl<'a, 'tcx> CrateMetadata {
// DefIndex's in root.proc_macro_data have a one-to-one correspondence
// with items in 'raw_proc_macros'.
// NOTE: If you update the order of macros in 'proc_macro_data' for any reason,
// you must also update src/libsyntax_ext/proc_macro_harness.rs
// you must also update src/librustc_builtin_macros/proc_macro_harness.rs
// Failing to do so will result in incorrect data being associated
// with proc macros when deserialized.
let pos = self.root.proc_macro_data.unwrap().decode(self).position(|i| i == id).unwrap();
@@ -26,7 +26,7 @@ rustc_lexer = { path = "../librustc_lexer" }
rustc_macros = { path = "../librustc_macros" }
rustc_serialize = { path = "../libserialize", package = "serialize" }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc_apfloat = { path = "../librustc_apfloat" }
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
rustc_error_codes = { path = "../librustc_error_codes" }
@@ -18,6 +18,6 @@ rustc_lexer = { path = "../librustc_lexer" }
rustc_errors = { path = "../librustc_errors" }
rustc_error_codes = { path = "../librustc_error_codes" }
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
syntax = { path = "../libsyntax" }
unicode-normalization = "0.1.11"
@@ -17,6 +17,6 @@ rustc_index = { path = "../librustc_index" }
rustc_parse = { path = "../librustc_parse" }
rustc_target = { path = "../librustc_target" }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
errors = { path = "../librustc_errors", package = "rustc_errors" }
rustc_error_codes = { path = "../librustc_error_codes" }
@@ -14,5 +14,5 @@ doctest = false
rustc = { path = "../librustc" }
rustc_metadata = { path = "../librustc_metadata" }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc_error_codes = { path = "../librustc_error_codes" }
@@ -12,7 +12,7 @@ path = "lib.rs"
rustc = { path = "../librustc" }
rustc_typeck = { path = "../librustc_typeck" }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc_data_structures = { path = "../librustc_data_structures" }
rustc_error_codes = { path = "../librustc_error_codes" }
log = "0.4"
@@ -14,11 +14,11 @@ doctest = false
bitflags = "1.2.1"
log = "0.4"
syntax = { path = "../libsyntax" }
syntax_expand = { path = "../libsyntax_expand" }
syntax_expand = { path = "../librustc_expand", package = "rustc_expand" }
rustc = { path = "../librustc" }
arena = { path = "../libarena" }
errors = { path = "../librustc_errors", package = "rustc_errors" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc_data_structures = { path = "../librustc_data_structures" }
rustc_feature = { path = "../librustc_feature" }
rustc_metadata = { path = "../librustc_metadata" }
@@ -16,6 +16,6 @@ rustc_codegen_utils = { path = "../librustc_codegen_utils" }
rustc_parse = { path = "../librustc_parse" }
serde_json = "1"
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rls-data = "0.19"
rls-span = "0.5"
@@ -15,7 +15,7 @@ rustc_feature = { path = "../librustc_feature" }
rustc_target = { path = "../librustc_target" }
rustc_serialize = { path = "../libserialize", package = "serialize" }
rustc_data_structures = { path = "../librustc_data_structures" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc_index = { path = "../librustc_index" }
rustc_fs_util = { path = "../librustc_fs_util" }
num_cpus = "1.0"
@@ -1,11 +1,11 @@
[package]
authors = ["The Rust Project Developers"]
name = "syntax_pos"
name = "rustc_span"
version = "0.0.0"
edition = "2018"

[lib]
name = "syntax_pos"
name = "rustc_span"
path = "lib.rs"
doctest = false

@@ -14,5 +14,5 @@ log = "0.4"
rustc_data_structures = { path = "../librustc_data_structures" }
rustc_macros = { path = "../librustc_macros" }
rustc_serialize = { path = "../libserialize", package = "serialize" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc_index = { path = "../librustc_index" }
@@ -15,6 +15,6 @@ rustc_data_structures = { path = "../librustc_data_structures" }
rustc_macros = { path = "../librustc_macros" }
rustc_target = { path = "../librustc_target" }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
chalk-engine = { version = "0.9.0", default-features=false }
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
@@ -19,6 +19,6 @@ errors = { path = "../librustc_errors", package = "rustc_errors" }
rustc_target = { path = "../librustc_target" }
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
syntax = { path = "../libsyntax" }
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
rustc_index = { path = "../librustc_index" }
rustc_error_codes = { path = "../librustc_error_codes" }
@@ -25,6 +25,7 @@ extern crate rustc;
extern crate rustc_data_structures;
extern crate rustc_driver;
extern crate rustc_error_codes;
extern crate rustc_expand as syntax_expand;
extern crate rustc_feature;
extern crate rustc_index;
extern crate rustc_interface;
@@ -33,11 +34,10 @@ extern crate rustc_lint;
extern crate rustc_metadata;
extern crate rustc_parse;
extern crate rustc_resolve;
extern crate rustc_span as syntax_pos;
extern crate rustc_target;
extern crate rustc_typeck;
extern crate syntax;
extern crate syntax_expand;
extern crate syntax_pos;
extern crate test as testing;
#[macro_use]
extern crate log;
@@ -15,7 +15,7 @@ rustc_serialize = { path = "../libserialize", package = "serialize" }
log = "0.4"
scoped-tls = "1.0"
lazy_static = "1.0.0"
syntax_pos = { path = "../libsyntax_pos" }
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
errors = { path = "../librustc_errors", package = "rustc_errors" }
rustc_data_structures = { path = "../librustc_data_structures" }
rustc_feature = { path = "../librustc_feature" }

0 comments on commit b9a9c5b

Please sign in to comment.
You can’t perform that action at this time.