Skip to content

Commit 11d9514

Browse files
petrochenkovpetrochenkov
committed
Make things build again
1 parent 47197d6 commit 11d9514

File tree

33 files changed

+106
-106
lines changed

33 files changed

+106
-106
lines changed

‎Cargo.lock

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

‎src/librustc_arena/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 = "arena"
3+
name = "rustc_arena"
44
version = "0.0.0"
55
edition = "2018"
66

77
[lib]
8-
name = "arena"
8+
name = "rustc_arena"
99
path = "lib.rs"
1010

1111
[dependencies]

‎src/librustc_ast/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ path = "lib.rs"
1010
doctest = false
1111

1212
[dependencies]
13-
rustc_serialize = { path = "../libserialize", package = "serialize" }
13+
rustc_serialize = { path = "../librustc_serialize" }
1414
log = "0.4"
1515
scoped-tls = "1.0"
1616
rustc_span = { path = "../librustc_span" }

‎src/librustc_ast_lowering/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ path = "lib.rs"
1010
doctest = false
1111

1212
[dependencies]
13-
arena = { path = "../libarena" }
13+
arena = { path = "../librustc_arena", package = "rustc_arena" }
1414
log = { version = "0.4", features = ["release_max_level_info", "std"] }
1515
rustc_ast_pretty = { path = "../librustc_ast_pretty" }
1616
rustc_hir = { path = "../librustc_hir" }

‎src/librustc_attr/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ doctest = false
1212

1313
[dependencies]
1414
rustc_ast_pretty = { path = "../librustc_ast_pretty" }
15-
rustc_serialize = { path = "../libserialize", package = "serialize" }
15+
rustc_serialize = { path = "../librustc_serialize" }
1616
rustc_errors = { path = "../librustc_errors" }
1717
rustc_span = { path = "../librustc_span" }
1818
rustc_data_structures = { path = "../librustc_data_structures" }

‎src/librustc_builtin_macros/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ path = "lib.rs"
1010
doctest = false
1111

1212
[dependencies]
13-
fmt_macros = { path = "../libfmt_macros" }
13+
fmt_macros = { path = "../librustc_parse_format", package = "rustc_parse_format" }
1414
log = "0.4"
1515
rustc_ast_pretty = { path = "../librustc_ast_pretty" }
1616
rustc_attr = { path = "../librustc_attr" }

‎src/librustc_codegen_llvm/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ rustc_incremental = { path = "../librustc_incremental" }
2929
rustc_index = { path = "../librustc_index" }
3030
rustc_llvm = { path = "../librustc_llvm" }
3131
rustc_session = { path = "../librustc_session" }
32-
rustc_serialize = { path = "../libserialize", package = "serialize" }
32+
rustc_serialize = { path = "../librustc_serialize" }
3333
rustc_target = { path = "../librustc_target" }
3434
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
3535
rustc_ast = { path = "../librustc_ast" }

‎src/librustc_codegen_ssa/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ libc = "0.2.50"
1919
jobserver = "0.1.11"
2020
tempfile = "3.1"
2121

22-
rustc_serialize = { path = "../libserialize", package = "serialize" }
22+
rustc_serialize = { path = "../librustc_serialize" }
2323
rustc_ast = { path = "../librustc_ast" }
2424
rustc_span = { path = "../librustc_span" }
2525
rustc_middle = { path = "../librustc_middle" }

‎src/librustc_data_structures/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ log = "0.4"
1616
jobserver_crate = { version = "0.1.13", package = "jobserver" }
1717
lazy_static = "1"
1818
once_cell = { version = "1", features = ["parking_lot"] }
19-
rustc_serialize = { path = "../libserialize", package = "serialize" }
20-
graphviz = { path = "../libgraphviz" }
19+
rustc_serialize = { path = "../librustc_serialize" }
20+
graphviz = { path = "../librustc_graphviz", package = "rustc_graphviz" }
2121
cfg-if = "0.1.2"
2222
crossbeam-utils = { version = "0.7", features = ["nightly"] }
2323
stable_deref_trait = "1.0.0"

‎src/librustc_driver/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
3232
rustc_session = { path = "../librustc_session" }
3333
rustc_error_codes = { path = "../librustc_error_codes" }
3434
rustc_interface = { path = "../librustc_interface" }
35-
rustc_serialize = { path = "../libserialize", package = "serialize" }
35+
rustc_serialize = { path = "../librustc_serialize" }
3636
rustc_ast = { path = "../librustc_ast" }
3737
rustc_span = { path = "../librustc_span" }
3838

‎src/librustc_errors/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ doctest = false
1111

1212
[dependencies]
1313
log = "0.4"
14-
rustc_serialize = { path = "../libserialize", package = "serialize" }
14+
rustc_serialize = { path = "../librustc_serialize" }
1515
rustc_span = { path = "../librustc_span" }
1616
rustc_data_structures = { path = "../librustc_data_structures" }
1717
unicode-width = "0.1.4"

‎src/librustc_expand/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ path = "lib.rs"
1111
doctest = false
1212

1313
[dependencies]
14-
rustc_serialize = { path = "../libserialize", package = "serialize" }
14+
rustc_serialize = { path = "../librustc_serialize" }
1515
log = "0.4"
1616
rustc_span = { path = "../librustc_span" }
1717
rustc_ast_pretty = { path = "../librustc_ast_pretty" }

‎src/librustc_graphviz/Cargo.toml

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

77
[lib]
8-
name = "graphviz"
8+
name = "rustc_graphviz"
99
path = "lib.rs"

‎src/librustc_hir/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ rustc_macros = { path = "../librustc_macros" }
1515
rustc_data_structures = { path = "../librustc_data_structures" }
1616
rustc_index = { path = "../librustc_index" }
1717
rustc_span = { path = "../librustc_span" }
18-
rustc_serialize = { path = "../libserialize", package = "serialize" }
18+
rustc_serialize = { path = "../librustc_serialize" }
1919
rustc_ast = { path = "../librustc_ast" }
2020
lazy_static = "1"
2121
log = { version = "0.4", features = ["release_max_level_info", "std"] }

‎src/librustc_incremental/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ path = "lib.rs"
1010
doctest = false
1111

1212
[dependencies]
13-
graphviz = { path = "../libgraphviz" }
13+
graphviz = { path = "../librustc_graphviz", package = "rustc_graphviz" }
1414
log = "0.4"
1515
rand = "0.7"
1616
rustc_middle = { path = "../librustc_middle" }
1717
rustc_data_structures = { path = "../librustc_data_structures" }
1818
rustc_hir = { path = "../librustc_hir" }
19-
rustc_serialize = { path = "../libserialize", package = "serialize" }
19+
rustc_serialize = { path = "../librustc_serialize" }
2020
rustc_ast = { path = "../librustc_ast" }
2121
rustc_span = { path = "../librustc_span" }
2222
rustc_fs_util = { path = "../librustc_fs_util" }

‎src/librustc_index/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ path = "lib.rs"
1010
doctest = false
1111

1212
[dependencies]
13-
rustc_serialize = { path = "../libserialize", package = "serialize" }
13+
rustc_serialize = { path = "../librustc_serialize" }
1414
smallvec = { version = "1.0", features = ["union", "may_dangle"] }

‎src/librustc_infer/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ path = "lib.rs"
1010
doctest = false
1111

1212
[dependencies]
13-
graphviz = { path = "../libgraphviz" }
13+
graphviz = { path = "../librustc_graphviz", package = "rustc_graphviz" }
1414
log = { version = "0.4", features = ["release_max_level_info", "std"] }
1515
rustc_middle = { path = "../librustc_middle" }
1616
rustc_data_structures = { path = "../librustc_data_structures" }
@@ -19,7 +19,7 @@ rustc_hir = { path = "../librustc_hir" }
1919
rustc_index = { path = "../librustc_index" }
2020
rustc_macros = { path = "../librustc_macros" }
2121
rustc_session = { path = "../librustc_session" }
22-
rustc_serialize = { path = "../libserialize", package = "serialize" }
22+
rustc_serialize = { path = "../librustc_serialize" }
2323
rustc_span = { path = "../librustc_span" }
2424
rustc_target = { path = "../librustc_target" }
2525
smallvec = { version = "1.0", features = ["union", "may_dangle"] }

‎src/librustc_interface/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ rustc_expand = { path = "../librustc_expand" }
2121
rustc_parse = { path = "../librustc_parse" }
2222
rustc_session = { path = "../librustc_session" }
2323
rustc_span = { path = "../librustc_span" }
24-
rustc_serialize = { path = "../libserialize", package = "serialize" }
24+
rustc_serialize = { path = "../librustc_serialize" }
2525
rustc_middle = { path = "../librustc_middle" }
2626
rustc_ast_lowering = { path = "../librustc_ast_lowering" }
2727
rustc_ast_passes = { path = "../librustc_ast_passes" }

‎src/librustc_metadata/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ rustc_hir = { path = "../librustc_hir" }
2323
rustc_hir_pretty = { path = "../librustc_hir_pretty" }
2424
rustc_target = { path = "../librustc_target" }
2525
rustc_index = { path = "../librustc_index" }
26-
rustc_serialize = { path = "../libserialize", package = "serialize" }
26+
rustc_serialize = { path = "../librustc_serialize" }
2727
stable_deref_trait = "1.0.0"
2828
rustc_ast = { path = "../librustc_ast" }
2929
rustc_expand = { path = "../librustc_expand" }

‎src/librustc_middle/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ path = "lib.rs"
1010
doctest = false
1111

1212
[dependencies]
13-
arena = { path = "../libarena" }
13+
arena = { path = "../librustc_arena", package = "rustc_arena" }
1414
bitflags = "1.2.1"
1515
scoped-tls = "1.0"
1616
log = { version = "0.4", features = ["release_max_level_info", "std"] }
@@ -26,7 +26,7 @@ rustc_data_structures = { path = "../librustc_data_structures" }
2626
rustc_query_system = { path = "../librustc_query_system" }
2727
rustc_errors = { path = "../librustc_errors" }
2828
rustc_index = { path = "../librustc_index" }
29-
rustc_serialize = { path = "../libserialize", package = "serialize" }
29+
rustc_serialize = { path = "../librustc_serialize" }
3030
rustc_ast = { path = "../librustc_ast" }
3131
rustc_span = { path = "../librustc_span" }
3232
byteorder = { version = "1.3" }

‎src/librustc_mir/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ doctest = false
1111

1212
[dependencies]
1313
either = "1.5.0"
14-
dot = { path = "../libgraphviz", package = "graphviz" }
14+
dot = { path = "../librustc_graphviz", package = "rustc_graphviz" }
1515
itertools = "0.8"
1616
log = "0.4"
1717
log_settings = "0.1.1"
@@ -25,7 +25,7 @@ rustc_index = { path = "../librustc_index" }
2525
rustc_infer = { path = "../librustc_infer" }
2626
rustc_lexer = { path = "../librustc_lexer" }
2727
rustc_macros = { path = "../librustc_macros" }
28-
rustc_serialize = { path = "../libserialize", package = "serialize" }
28+
rustc_serialize = { path = "../librustc_serialize" }
2929
rustc_session = { path = "../librustc_session" }
3030
rustc_target = { path = "../librustc_target" }
3131
rustc_trait_selection = { path = "../librustc_trait_selection" }

‎src/librustc_mir/borrow_check/region_infer/graphviz.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//! This module provides linkage between RegionInferenceContext and
2-
//! libgraphviz traits, specialized to attaching borrowck analysis
2+
//! librustc_graphviz traits, specialized to attaching borrowck analysis
33
//! data to rendered labels.
44
55
use std::borrow::Cow;

‎src/librustc_mir/util/graphviz.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ where
7676
/// Write a graphviz HTML-styled label for the given basic block, with
7777
/// all necessary escaping already performed. (This is suitable for
7878
/// emitting directly, as is done in this module, or for use with the
79-
/// LabelText::HtmlStr from libgraphviz.)
79+
/// LabelText::HtmlStr from librustc_graphviz.)
8080
///
8181
/// `init` and `fini` are callbacks for emitting additional rows of
8282
/// data (using HTML enclosed with `<tr>` in the emitted text).

‎src/librustc_mir_build/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ path = "lib.rs"
1010
doctest = false
1111

1212
[dependencies]
13-
arena = { path = "../libarena" }
13+
arena = { path = "../librustc_arena", package = "rustc_arena" }
1414
log = "0.4"
1515
rustc_middle = { path = "../librustc_middle" }
1616
rustc_apfloat = { path = "../librustc_apfloat" }
@@ -20,7 +20,7 @@ rustc_index = { path = "../librustc_index" }
2020
rustc_errors = { path = "../librustc_errors" }
2121
rustc_hir = { path = "../librustc_hir" }
2222
rustc_infer = { path = "../librustc_infer" }
23-
rustc_serialize = { path = "../libserialize", package = "serialize" }
23+
rustc_serialize = { path = "../librustc_serialize" }
2424
rustc_session = { path = "../librustc_session" }
2525
rustc_span = { path = "../librustc_span" }
2626
rustc_target = { path = "../librustc_target" }

‎src/librustc_parse_format/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 = "fmt_macros"
3+
name = "rustc_parse_format"
44
version = "0.0.0"
55
edition = "2018"
66

77
[lib]
8-
name = "fmt_macros"
8+
name = "rustc_parse_format"
99
path = "lib.rs"
1010

1111
[dependencies]

‎src/librustc_query_system/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ path = "lib.rs"
1010
doctest = false
1111

1212
[dependencies]
13-
arena = { path = "../libarena" }
13+
arena = { path = "../librustc_arena", package = "rustc_arena" }
1414
log = { version = "0.4", features = ["release_max_level_info", "std"] }
1515
rustc-rayon-core = "0.3.0"
1616
rustc_data_structures = { path = "../librustc_data_structures" }
1717
rustc_errors = { path = "../librustc_errors" }
1818
rustc_index = { path = "../librustc_index" }
19-
rustc_serialize = { path = "../libserialize", package = "serialize" }
19+
rustc_serialize = { path = "../librustc_serialize" }
2020
rustc_span = { path = "../librustc_span" }
2121
parking_lot = "0.10"
2222
smallvec = { version = "1.0", features = ["union", "may_dangle"] }

‎src/librustc_resolve/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ doctest = false
1414
bitflags = "1.2.1"
1515
log = "0.4"
1616
rustc_ast = { path = "../librustc_ast" }
17-
arena = { path = "../libarena" }
17+
arena = { path = "../librustc_arena", package = "rustc_arena" }
1818
rustc_middle = { path = "../librustc_middle" }
1919
rustc_ast_lowering = { path = "../librustc_ast_lowering" }
2020
rustc_ast_pretty = { path = "../librustc_ast_pretty" }

‎src/librustc_serialize/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 = "serialize"
3+
name = "rustc_serialize"
44
version = "0.0.0"
55
edition = "2018"
66

77
[lib]
8-
name = "serialize"
8+
name = "rustc_serialize"
99
path = "lib.rs"
1010

1111
[dependencies]

‎src/librustc_session/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ log = "0.4"
1414
rustc_errors = { path = "../librustc_errors" }
1515
rustc_feature = { path = "../librustc_feature" }
1616
rustc_target = { path = "../librustc_target" }
17-
rustc_serialize = { path = "../libserialize", package = "serialize" }
17+
rustc_serialize = { path = "../librustc_serialize" }
1818
rustc_data_structures = { path = "../librustc_data_structures" }
1919
rustc_span = { path = "../librustc_span" }
2020
rustc_fs_util = { path = "../librustc_fs_util" }

‎src/librustc_span/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ path = "lib.rs"
1010
doctest = false
1111

1212
[dependencies]
13-
rustc_serialize = { path = "../libserialize", package = "serialize" }
13+
rustc_serialize = { path = "../librustc_serialize" }
1414
rustc_macros = { path = "../librustc_macros" }
1515
rustc_data_structures = { path = "../librustc_data_structures" }
1616
rustc_index = { path = "../librustc_index" }
17-
arena = { path = "../libarena" }
17+
arena = { path = "../librustc_arena", package = "rustc_arena" }
1818
scoped-tls = "1.0"
1919
unicode-width = "0.1.4"
2020
cfg-if = "0.1.2"

‎src/librustc_target/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ bitflags = "1.2.1"
1313
log = "0.4"
1414
rustc_data_structures = { path = "../librustc_data_structures" }
1515
rustc_macros = { path = "../librustc_macros" }
16-
rustc_serialize = { path = "../libserialize", package = "serialize" }
16+
rustc_serialize = { path = "../librustc_serialize" }
1717
rustc_span = { path = "../librustc_span" }
1818
rustc_index = { path = "../librustc_index" }

‎src/librustc_trait_selection/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ path = "lib.rs"
1010
doctest = false
1111

1212
[dependencies]
13-
fmt_macros = { path = "../libfmt_macros" }
13+
fmt_macros = { path = "../librustc_parse_format", package = "rustc_parse_format" }
1414
log = { version = "0.4", features = ["release_max_level_info", "std"] }
1515
rustc_attr = { path = "../librustc_attr" }
1616
rustc_middle = { path = "../librustc_middle" }

‎src/librustc_typeck/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ test = false
1111
doctest = false
1212

1313
[dependencies]
14-
arena = { path = "../libarena" }
14+
arena = { path = "../librustc_arena", package = "rustc_arena" }
1515
log = "0.4"
1616
rustc_middle = { path = "../librustc_middle" }
1717
rustc_attr = { path = "../librustc_attr" }

0 commit comments

Comments
 (0)