Skip to content

Commit b9a9c5b

Browse files
petrochenkovpetrochenkov
committedDec 30, 2019
Make things build again
·
1.85.11.42.0
1 parent b683de4 commit b9a9c5b

File tree

32 files changed

+125
-125
lines changed

32 files changed

+125
-125
lines changed
 

‎Cargo.lock

+78-78
Large diffs are not rendered by default.

‎src/libfmt_macros/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ name = "fmt_macros"
99
path = "lib.rs"
1010

1111
[dependencies]
12-
syntax_pos = { path = "../libsyntax_pos" }
12+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
1313
rustc_lexer = { path = "../librustc_lexer" }

‎src/librustc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ rustc_index = { path = "../librustc_index" }
3030
errors = { path = "../librustc_errors", package = "rustc_errors" }
3131
rustc_serialize = { path = "../libserialize", package = "serialize" }
3232
syntax = { path = "../libsyntax" }
33-
syntax_pos = { path = "../libsyntax_pos" }
33+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
3434
backtrace = "0.3.40"
3535
parking_lot = "0.9"
3636
byteorder = { version = "1.3" }

‎src/librustc_builtin_macros/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
authors = ["The Rust Project Developers"]
3-
name = "syntax_ext"
3+
name = "rustc_builtin_macros"
44
version = "0.0.0"
55
edition = "2018"
66

77
[lib]
8-
name = "syntax_ext"
8+
name = "rustc_builtin_macros"
99
path = "lib.rs"
1010
doctest = false
1111

@@ -19,6 +19,6 @@ rustc_parse = { path = "../librustc_parse" }
1919
rustc_target = { path = "../librustc_target" }
2020
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
2121
syntax = { path = "../libsyntax" }
22-
syntax_expand = { path = "../libsyntax_expand" }
23-
syntax_pos = { path = "../libsyntax_pos" }
22+
syntax_expand = { path = "../librustc_expand", package = "rustc_expand" }
23+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
2424
rustc_error_codes = { path = "../librustc_error_codes" }

‎src/librustc_builtin_macros/deriving/generic/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,8 @@ impl<'a> TraitDef<'a> {
412412
_ => {
413413
// Non-ADT derive is an error, but it should have been
414414
// set earlier; see
415-
// libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
416-
// libsyntax_expand/base.rs:Annotatable::derive_allowed()
415+
// librustc_expand/expand.rs:MacroExpander::fully_expand_fragment()
416+
// librustc_expand/base.rs:Annotatable::derive_allowed()
417417
return;
418418
}
419419
};
@@ -487,8 +487,8 @@ impl<'a> TraitDef<'a> {
487487
_ => {
488488
// Non-Item derive is an error, but it should have been
489489
// set earlier; see
490-
// libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
491-
// libsyntax_expand/base.rs:Annotatable::derive_allowed()
490+
// librustc_expand/expand.rs:MacroExpander::fully_expand_fragment()
491+
// librustc_expand/base.rs:Annotatable::derive_allowed()
492492
return;
493493
}
494494
}

‎src/librustc_builtin_macros/deriving/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ fn inject_impl_of_structural_trait(
9292
_ => {
9393
// Non-Item derive is an error, but it should have been
9494
// set earlier; see
95-
// libsyntax_expand/expand.rs:MacroExpander::fully_expand_fragment()
96-
// libsyntax_expand/base.rs:Annotatable::derive_allowed()
95+
// librustc_expand/expand.rs:MacroExpander::fully_expand_fragment()
96+
// librustc_expand/base.rs:Annotatable::derive_allowed()
9797
return;
9898
}
9999
};

‎src/librustc_codegen_llvm/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,5 @@ rustc_session = { path = "../librustc_session" }
3030
rustc_target = { path = "../librustc_target" }
3131
smallvec = { version = "0.6.7", features = ["union", "may_dangle"] }
3232
syntax = { path = "../libsyntax" }
33-
syntax_expand = { path = "../libsyntax_expand" }
34-
syntax_pos = { path = "../libsyntax_pos" }
33+
syntax_expand = { path = "../librustc_expand", package = "rustc_expand" }
34+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }

‎src/librustc_codegen_ssa/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ tempfile = "3.1"
2121

2222
rustc_serialize = { path = "../libserialize", package = "serialize" }
2323
syntax = { path = "../libsyntax" }
24-
syntax_pos = { path = "../libsyntax_pos" }
24+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
2525
rustc = { path = "../librustc" }
2626
rustc_apfloat = { path = "../librustc_apfloat" }
2727
rustc_codegen_utils = { path = "../librustc_codegen_utils" }

‎src/librustc_codegen_utils/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ punycode = "0.4.0"
1515
rustc-demangle = "0.1.16"
1616

1717
syntax = { path = "../libsyntax" }
18-
syntax_pos = { path = "../libsyntax_pos" }
18+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
1919
rustc = { path = "../librustc" }
2020
rustc_target = { path = "../librustc_target" }
2121
rustc_data_structures = { path = "../librustc_data_structures" }

‎src/librustc_driver/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ rustc_interface = { path = "../librustc_interface" }
3131
rustc_serialize = { path = "../libserialize", package = "serialize" }
3232
rustc_resolve = { path = "../librustc_resolve" }
3333
syntax = { path = "../libsyntax" }
34-
syntax_pos = { path = "../libsyntax_pos" }
34+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
3535

3636
[features]
3737
llvm = ['rustc_interface/llvm']

‎src/librustc_errors/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ doctest = false
1212
[dependencies]
1313
log = "0.4"
1414
rustc_serialize = { path = "../libserialize", package = "serialize" }
15-
syntax_pos = { path = "../libsyntax_pos" }
15+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
1616
rustc_data_structures = { path = "../librustc_data_structures" }
1717
unicode-width = "0.1.4"
1818
atty = "0.2"

‎src/librustc_expand/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
[package]
22
authors = ["The Rust Project Developers"]
3-
name = "syntax_expand"
3+
name = "rustc_expand"
44
version = "0.0.0"
55
edition = "2018"
66
build = false
77

88
[lib]
9-
name = "syntax_expand"
9+
name = "rustc_expand"
1010
path = "lib.rs"
1111
doctest = false
1212

1313
[dependencies]
1414
rustc_serialize = { path = "../libserialize", package = "serialize" }
1515
log = "0.4"
16-
syntax_pos = { path = "../libsyntax_pos" }
16+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
1717
errors = { path = "../librustc_errors", package = "rustc_errors" }
1818
rustc_data_structures = { path = "../librustc_data_structures" }
1919
rustc_feature = { path = "../librustc_feature" }

‎src/librustc_feature/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ doctest = false
1212
[dependencies]
1313
rustc_data_structures = { path = "../librustc_data_structures" }
1414
lazy_static = "1.0.0"
15-
syntax_pos = { path = "../libsyntax_pos" }
15+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }

‎src/librustc_incremental/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ rustc = { path = "../librustc" }
1717
rustc_data_structures = { path = "../librustc_data_structures" }
1818
rustc_serialize = { path = "../libserialize", package = "serialize" }
1919
syntax = { path = "../libsyntax" }
20-
syntax_pos = { path = "../libsyntax_pos" }
20+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
2121
rustc_fs_util = { path = "../librustc_fs_util" }
2222
rustc_session = { path = "../librustc_session" }

‎src/librustc_interface/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ log = "0.4"
1414
rayon = { version = "0.3.0", package = "rustc-rayon" }
1515
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
1616
syntax = { path = "../libsyntax" }
17-
syntax_ext = { path = "../libsyntax_ext" }
18-
syntax_expand = { path = "../libsyntax_expand" }
17+
syntax_ext = { path = "../librustc_builtin_macros", package = "rustc_builtin_macros" }
18+
syntax_expand = { path = "../librustc_expand", package = "rustc_expand" }
1919
rustc_parse = { path = "../librustc_parse" }
20-
syntax_pos = { path = "../libsyntax_pos" }
20+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
2121
rustc_serialize = { path = "../libserialize", package = "serialize" }
2222
rustc = { path = "../librustc" }
2323
rustc_incremental = { path = "../librustc_incremental" }

‎src/librustc_lint/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ log = "0.4"
1313
rustc = { path = "../librustc" }
1414
rustc_target = { path = "../librustc_target" }
1515
syntax = { path = "../libsyntax" }
16-
syntax_pos = { path = "../libsyntax_pos" }
16+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
1717
rustc_data_structures = { path = "../librustc_data_structures" }
1818
rustc_feature = { path = "../librustc_feature" }
1919
rustc_index = { path = "../librustc_index" }

‎src/librustc_metadata/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ rustc_index = { path = "../librustc_index" }
2222
rustc_serialize = { path = "../libserialize", package = "serialize" }
2323
stable_deref_trait = "1.0.0"
2424
syntax = { path = "../libsyntax" }
25-
syntax_expand = { path = "../libsyntax_expand" }
25+
syntax_expand = { path = "../librustc_expand", package = "rustc_expand" }
2626
rustc_parse = { path = "../librustc_parse" }
27-
syntax_pos = { path = "../libsyntax_pos" }
27+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
2828
rustc_error_codes = { path = "../librustc_error_codes" }

‎src/librustc_metadata/rmeta/decoder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ impl<'a, 'tcx> CrateMetadata {
637637
// DefIndex's in root.proc_macro_data have a one-to-one correspondence
638638
// with items in 'raw_proc_macros'.
639639
// NOTE: If you update the order of macros in 'proc_macro_data' for any reason,
640-
// you must also update src/libsyntax_ext/proc_macro_harness.rs
640+
// you must also update src/librustc_builtin_macros/proc_macro_harness.rs
641641
// Failing to do so will result in incorrect data being associated
642642
// with proc macros when deserialized.
643643
let pos = self.root.proc_macro_data.unwrap().decode(self).position(|i| i == id).unwrap();

‎src/librustc_mir/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ rustc_lexer = { path = "../librustc_lexer" }
2626
rustc_macros = { path = "../librustc_macros" }
2727
rustc_serialize = { path = "../libserialize", package = "serialize" }
2828
syntax = { path = "../libsyntax" }
29-
syntax_pos = { path = "../libsyntax_pos" }
29+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
3030
rustc_apfloat = { path = "../librustc_apfloat" }
3131
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
3232
rustc_error_codes = { path = "../librustc_error_codes" }

‎src/librustc_parse/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ rustc_lexer = { path = "../librustc_lexer" }
1818
rustc_errors = { path = "../librustc_errors" }
1919
rustc_error_codes = { path = "../librustc_error_codes" }
2020
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
21-
syntax_pos = { path = "../libsyntax_pos" }
21+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
2222
syntax = { path = "../libsyntax" }
2323
unicode-normalization = "0.1.11"

‎src/librustc_passes/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ rustc_index = { path = "../librustc_index" }
1717
rustc_parse = { path = "../librustc_parse" }
1818
rustc_target = { path = "../librustc_target" }
1919
syntax = { path = "../libsyntax" }
20-
syntax_pos = { path = "../libsyntax_pos" }
20+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
2121
errors = { path = "../librustc_errors", package = "rustc_errors" }
2222
rustc_error_codes = { path = "../librustc_error_codes" }

‎src/librustc_plugin_impl/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ doctest = false
1414
rustc = { path = "../librustc" }
1515
rustc_metadata = { path = "../librustc_metadata" }
1616
syntax = { path = "../libsyntax" }
17-
syntax_pos = { path = "../libsyntax_pos" }
17+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
1818
rustc_error_codes = { path = "../librustc_error_codes" }

‎src/librustc_privacy/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ path = "lib.rs"
1212
rustc = { path = "../librustc" }
1313
rustc_typeck = { path = "../librustc_typeck" }
1414
syntax = { path = "../libsyntax" }
15-
syntax_pos = { path = "../libsyntax_pos" }
15+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
1616
rustc_data_structures = { path = "../librustc_data_structures" }
1717
rustc_error_codes = { path = "../librustc_error_codes" }
1818
log = "0.4"

‎src/librustc_resolve/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ doctest = false
1414
bitflags = "1.2.1"
1515
log = "0.4"
1616
syntax = { path = "../libsyntax" }
17-
syntax_expand = { path = "../libsyntax_expand" }
17+
syntax_expand = { path = "../librustc_expand", package = "rustc_expand" }
1818
rustc = { path = "../librustc" }
1919
arena = { path = "../libarena" }
2020
errors = { path = "../librustc_errors", package = "rustc_errors" }
21-
syntax_pos = { path = "../libsyntax_pos" }
21+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
2222
rustc_data_structures = { path = "../librustc_data_structures" }
2323
rustc_feature = { path = "../librustc_feature" }
2424
rustc_metadata = { path = "../librustc_metadata" }

‎src/librustc_save_analysis/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ rustc_codegen_utils = { path = "../librustc_codegen_utils" }
1616
rustc_parse = { path = "../librustc_parse" }
1717
serde_json = "1"
1818
syntax = { path = "../libsyntax" }
19-
syntax_pos = { path = "../libsyntax_pos" }
19+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
2020
rls-data = "0.19"
2121
rls-span = "0.5"

‎src/librustc_session/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ rustc_feature = { path = "../librustc_feature" }
1515
rustc_target = { path = "../librustc_target" }
1616
rustc_serialize = { path = "../libserialize", package = "serialize" }
1717
rustc_data_structures = { path = "../librustc_data_structures" }
18-
syntax_pos = { path = "../libsyntax_pos" }
18+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
1919
rustc_index = { path = "../librustc_index" }
2020
rustc_fs_util = { path = "../librustc_fs_util" }
2121
num_cpus = "1.0"

‎src/librustc_span/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
authors = ["The Rust Project Developers"]
3-
name = "syntax_pos"
3+
name = "rustc_span"
44
version = "0.0.0"
55
edition = "2018"
66

77
[lib]
8-
name = "syntax_pos"
8+
name = "rustc_span"
99
path = "lib.rs"
1010
doctest = false
1111

‎src/librustc_target/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ log = "0.4"
1414
rustc_data_structures = { path = "../librustc_data_structures" }
1515
rustc_macros = { path = "../librustc_macros" }
1616
rustc_serialize = { path = "../libserialize", package = "serialize" }
17-
syntax_pos = { path = "../libsyntax_pos" }
17+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
1818
rustc_index = { path = "../librustc_index" }

‎src/librustc_traits/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ rustc_data_structures = { path = "../librustc_data_structures" }
1515
rustc_macros = { path = "../librustc_macros" }
1616
rustc_target = { path = "../librustc_target" }
1717
syntax = { path = "../libsyntax" }
18-
syntax_pos = { path = "../libsyntax_pos" }
18+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
1919
chalk-engine = { version = "0.9.0", default-features=false }
2020
smallvec = { version = "1.0", features = ["union", "may_dangle"] }

‎src/librustc_typeck/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ errors = { path = "../librustc_errors", package = "rustc_errors" }
1919
rustc_target = { path = "../librustc_target" }
2020
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
2121
syntax = { path = "../libsyntax" }
22-
syntax_pos = { path = "../libsyntax_pos" }
22+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
2323
rustc_index = { path = "../librustc_index" }
2424
rustc_error_codes = { path = "../librustc_error_codes" }

‎src/librustdoc/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ extern crate rustc;
2525
extern crate rustc_data_structures;
2626
extern crate rustc_driver;
2727
extern crate rustc_error_codes;
28+
extern crate rustc_expand as syntax_expand;
2829
extern crate rustc_feature;
2930
extern crate rustc_index;
3031
extern crate rustc_interface;
@@ -33,11 +34,10 @@ extern crate rustc_lint;
3334
extern crate rustc_metadata;
3435
extern crate rustc_parse;
3536
extern crate rustc_resolve;
37+
extern crate rustc_span as syntax_pos;
3638
extern crate rustc_target;
3739
extern crate rustc_typeck;
3840
extern crate syntax;
39-
extern crate syntax_expand;
40-
extern crate syntax_pos;
4141
extern crate test as testing;
4242
#[macro_use]
4343
extern crate log;

‎src/libsyntax/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ rustc_serialize = { path = "../libserialize", package = "serialize" }
1515
log = "0.4"
1616
scoped-tls = "1.0"
1717
lazy_static = "1.0.0"
18-
syntax_pos = { path = "../libsyntax_pos" }
18+
syntax_pos = { path = "../librustc_span", package = "rustc_span" }
1919
errors = { path = "../librustc_errors", package = "rustc_errors" }
2020
rustc_data_structures = { path = "../librustc_data_structures" }
2121
rustc_feature = { path = "../librustc_feature" }

0 commit comments

Comments
 (0)
Please sign in to comment.