Skip to content

Commit 85fbf49

Browse files
committed
Auto merge of #74862 - mark-i-m:mv-compiler, r=petrochenkov
Move almost all compiler crates to compiler/ This PR implements rust-lang/compiler-team#336 and moves all `rustc_*` crates from `src` to the new `compiler` directory. `librustc_foo` directories are renamed to `rustc_foo`. `src` directories are introduced inside `rustc_*` directories to mirror the scheme already use for `library` crates.
2 parents db534b3 + 9e5f7d5 commit 85fbf49

File tree

1,686 files changed

+941
-1051
lines changed

Some content is hidden

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

1,686 files changed

+941
-1051
lines changed

Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
[workspace]
22
members = [
33
"src/bootstrap",
4-
"src/rustc",
5-
"src/librustc_codegen_llvm",
4+
"compiler/rustc",
65
"library/std",
76
"library/test",
87
"src/tools/cargotest",

src/rustc/Cargo.toml renamed to compiler/rustc/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ edition = '2018'
66

77
[[bin]]
88
name = "rustc_binary"
9-
path = "rustc.rs"
9+
path = "src/main.rs"
1010

1111
[dependencies]
12-
rustc_driver = { path = "../librustc_driver" }
12+
rustc_driver = { path = "../rustc_driver" }
1313

1414
# Make sure rustc_codegen_ssa ends up in the sysroot, because this
1515
# crate is intended to be used by codegen backends, which may not be in-tree.
16-
rustc_codegen_ssa = { path = "../librustc_codegen_ssa" }
16+
rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
1717

1818
[dependencies.jemalloc-sys]
1919
version = '0.3.0'
File renamed without changes.

src/librustc_apfloat/Cargo.toml renamed to compiler/rustc_apfloat/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ name = "rustc_apfloat"
44
version = "0.0.0"
55
edition = "2018"
66

7-
[lib]
8-
name = "rustc_apfloat"
9-
path = "lib.rs"
10-
117
[dependencies]
128
bitflags = "1.2.1"
139
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/librustc_arena/Cargo.toml renamed to compiler/rustc_arena/Cargo.toml

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ name = "rustc_arena"
44
version = "0.0.0"
55
edition = "2018"
66

7-
[lib]
8-
name = "rustc_arena"
9-
path = "lib.rs"
10-
117
[dependencies]
12-
rustc_data_structures = { path = "../librustc_data_structures" }
8+
rustc_data_structures = { path = "../rustc_data_structures" }
139
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
File renamed without changes.
File renamed without changes.

compiler/rustc_ast/Cargo.toml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[package]
2+
authors = ["The Rust Project Developers"]
3+
name = "rustc_ast"
4+
version = "0.0.0"
5+
edition = "2018"
6+
7+
[lib]
8+
doctest = false
9+
10+
[dependencies]
11+
rustc_serialize = { path = "../rustc_serialize" }
12+
tracing = "0.1"
13+
rustc_span = { path = "../rustc_span" }
14+
rustc_data_structures = { path = "../rustc_data_structures" }
15+
rustc_index = { path = "../rustc_index" }
16+
rustc_lexer = { path = "../rustc_lexer" }
17+
rustc_macros = { path = "../rustc_macros" }
18+
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
19+
bitflags = "1.2.1"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
[package]
2+
authors = ["The Rust Project Developers"]
3+
name = "rustc_ast_lowering"
4+
version = "0.0.0"
5+
edition = "2018"
6+
7+
[lib]
8+
doctest = false
9+
10+
[dependencies]
11+
rustc_arena = { path = "../rustc_arena" }
12+
tracing = "0.1"
13+
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
14+
rustc_hir = { path = "../rustc_hir" }
15+
rustc_target = { path = "../rustc_target" }
16+
rustc_data_structures = { path = "../rustc_data_structures" }
17+
rustc_index = { path = "../rustc_index" }
18+
rustc_span = { path = "../rustc_span" }
19+
rustc_errors = { path = "../rustc_errors" }
20+
rustc_session = { path = "../rustc_session" }
21+
rustc_ast = { path = "../rustc_ast" }
22+
smallvec = { version = "1.0", features = ["union", "may_dangle"] }

compiler/rustc_ast_passes/Cargo.toml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
[package]
2+
authors = ["The Rust Project Developers"]
3+
name = "rustc_ast_passes"
4+
version = "0.0.0"
5+
edition = "2018"
6+
7+
[dependencies]
8+
itertools = "0.8"
9+
tracing = "0.1"
10+
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
11+
rustc_attr = { path = "../rustc_attr" }
12+
rustc_data_structures = { path = "../rustc_data_structures" }
13+
rustc_errors = { path = "../rustc_errors" }
14+
rustc_feature = { path = "../rustc_feature" }
15+
rustc_parse = { path = "../rustc_parse" }
16+
rustc_session = { path = "../rustc_session" }
17+
rustc_span = { path = "../rustc_span" }
18+
rustc_ast = { path = "../rustc_ast" }
File renamed without changes.

compiler/rustc_ast_pretty/Cargo.toml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
[package]
2+
authors = ["The Rust Project Developers"]
3+
name = "rustc_ast_pretty"
4+
version = "0.0.0"
5+
edition = "2018"
6+
7+
[lib]
8+
doctest = false
9+
10+
[dependencies]
11+
tracing = "0.1"
12+
rustc_span = { path = "../rustc_span" }
13+
rustc_ast = { path = "../rustc_ast" }
14+
rustc_target = { path = "../rustc_target" }
File renamed without changes.
File renamed without changes.

compiler/rustc_attr/Cargo.toml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[package]
2+
authors = ["The Rust Project Developers"]
3+
name = "rustc_attr"
4+
version = "0.0.0"
5+
edition = "2018"
6+
7+
[lib]
8+
doctest = false
9+
10+
[dependencies]
11+
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
12+
rustc_serialize = { path = "../rustc_serialize" }
13+
rustc_errors = { path = "../rustc_errors" }
14+
rustc_span = { path = "../rustc_span" }
15+
rustc_data_structures = { path = "../rustc_data_structures" }
16+
rustc_feature = { path = "../rustc_feature" }
17+
rustc_lexer = { path = "../rustc_lexer" }
18+
rustc_macros = { path = "../rustc_macros" }
19+
rustc_session = { path = "../rustc_session" }
20+
rustc_ast = { path = "../rustc_ast" }
21+
version_check = "0.9"
File renamed without changes.
File renamed without changes.
+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
[package]
2+
authors = ["The Rust Project Developers"]
3+
name = "rustc_builtin_macros"
4+
version = "0.0.0"
5+
edition = "2018"
6+
7+
[lib]
8+
doctest = false
9+
10+
[dependencies]
11+
rustc_parse_format = { path = "../rustc_parse_format" }
12+
tracing = "0.1"
13+
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
14+
rustc_attr = { path = "../rustc_attr" }
15+
rustc_data_structures = { path = "../rustc_data_structures" }
16+
rustc_errors = { path = "../rustc_errors" }
17+
rustc_feature = { path = "../rustc_feature" }
18+
rustc_parse = { path = "../rustc_parse" }
19+
rustc_target = { path = "../rustc_target" }
20+
rustc_session = { path = "../rustc_session" }
21+
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
22+
rustc_ast = { path = "../rustc_ast" }
23+
rustc_expand = { path = "../rustc_expand" }
24+
rustc_span = { path = "../rustc_span" }
+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[package]
2+
authors = ["The Rust Project Developers"]
3+
name = "rustc_codegen_llvm"
4+
version = "0.0.0"
5+
edition = "2018"
6+
7+
[lib]
8+
test = false
9+
doctest = false
10+
11+
[dependencies]
12+
bitflags = "1.0"
13+
libc = "0.2"
14+
measureme = "0.7.1"
15+
snap = "1"
16+
tracing = "0.1"
17+
rustc_middle = { path = "../rustc_middle" }
18+
rustc-demangle = "0.1"
19+
rustc_attr = { path = "../rustc_attr" }
20+
rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
21+
rustc_data_structures = { path = "../rustc_data_structures" }
22+
rustc_errors = { path = "../rustc_errors" }
23+
rustc_feature = { path = "../rustc_feature" }
24+
rustc_fs_util = { path = "../rustc_fs_util" }
25+
rustc_hir = { path = "../rustc_hir" }
26+
rustc_incremental = { path = "../rustc_incremental" }
27+
rustc_index = { path = "../rustc_index" }
28+
rustc_llvm = { path = "../../src/librustc_llvm" }
29+
rustc_session = { path = "../rustc_session" }
30+
rustc_serialize = { path = "../rustc_serialize" }
31+
rustc_target = { path = "../rustc_target" }
32+
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
33+
rustc_ast = { path = "../rustc_ast" }
34+
rustc_span = { path = "../rustc_span" }

compiler/rustc_codegen_ssa/Cargo.toml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
[package]
2+
authors = ["The Rust Project Developers"]
3+
name = "rustc_codegen_ssa"
4+
version = "0.0.0"
5+
edition = "2018"
6+
7+
[lib]
8+
test = false
9+
10+
[dependencies]
11+
bitflags = "1.2.1"
12+
cc = "1.0.1"
13+
num_cpus = "1.0"
14+
memmap = "0.7"
15+
tracing = "0.1"
16+
libc = "0.2.50"
17+
jobserver = "0.1.11"
18+
tempfile = "3.1"
19+
pathdiff = "0.2.0"
20+
21+
rustc_serialize = { path = "../rustc_serialize" }
22+
rustc_ast = { path = "../rustc_ast" }
23+
rustc_span = { path = "../rustc_span" }
24+
rustc_middle = { path = "../rustc_middle" }
25+
rustc_apfloat = { path = "../rustc_apfloat" }
26+
rustc_attr = { path = "../rustc_attr" }
27+
rustc_symbol_mangling = { path = "../rustc_symbol_mangling" }
28+
rustc_data_structures = { path = "../rustc_data_structures"}
29+
rustc_errors = { path = "../rustc_errors" }
30+
rustc_fs_util = { path = "../rustc_fs_util" }
31+
rustc_hir = { path = "../rustc_hir" }
32+
rustc_incremental = { path = "../rustc_incremental" }
33+
rustc_index = { path = "../rustc_index" }
34+
rustc_macros = { path = "../rustc_macros" }
35+
rustc_target = { path = "../rustc_target" }
36+
rustc_session = { path = "../rustc_session" }

src/librustc_data_structures/Cargo.toml renamed to compiler/rustc_data_structures/Cargo.toml

+4-6
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ version = "0.0.0"
55
edition = "2018"
66

77
[lib]
8-
name = "rustc_data_structures"
9-
path = "lib.rs"
108
doctest = false
119

1210
[dependencies]
@@ -16,17 +14,17 @@ tracing = "0.1"
1614
jobserver_crate = { version = "0.1.13", package = "jobserver" }
1715
lazy_static = "1"
1816
once_cell = { version = "1", features = ["parking_lot"] }
19-
rustc_serialize = { path = "../librustc_serialize" }
20-
rustc_macros = { path = "../librustc_macros" }
21-
rustc_graphviz = { path = "../librustc_graphviz" }
17+
rustc_serialize = { path = "../rustc_serialize" }
18+
rustc_macros = { path = "../rustc_macros" }
19+
rustc_graphviz = { path = "../rustc_graphviz" }
2220
cfg-if = "0.1.2"
2321
crossbeam-utils = { version = "0.7", features = ["nightly"] }
2422
stable_deref_trait = "1.0.0"
2523
rayon = { version = "0.3.0", package = "rustc-rayon" }
2624
rayon-core = { version = "0.3.0", package = "rustc-rayon-core" }
2725
rustc-hash = "1.1.0"
2826
smallvec = { version = "1.0", features = ["union", "may_dangle"] }
29-
rustc_index = { path = "../librustc_index", package = "rustc_index" }
27+
rustc_index = { path = "../rustc_index", package = "rustc_index" }
3028
bitflags = "1.2.1"
3129
measureme = "0.7.1"
3230
libc = "0.2"

compiler/rustc_driver/Cargo.toml

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
[package]
2+
authors = ["The Rust Project Developers"]
3+
name = "rustc_driver"
4+
version = "0.0.0"
5+
edition = "2018"
6+
7+
[lib]
8+
crate-type = ["dylib"]
9+
10+
[dependencies]
11+
lazy_static = "1.0"
12+
libc = "0.2"
13+
tracing = { version = "0.1.18", features = ["release_max_level_info"] }
14+
tracing-subscriber = { version = "0.2.10", default-features = false, features = ["fmt", "env-filter", "smallvec", "parking_lot", "ansi"] }
15+
rustc_middle = { path = "../rustc_middle" }
16+
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
17+
rustc_target = { path = "../rustc_target" }
18+
rustc_lint = { path = "../rustc_lint" }
19+
rustc_data_structures = { path = "../rustc_data_structures" }
20+
rustc_errors = { path = "../rustc_errors" }
21+
rustc_feature = { path = "../rustc_feature" }
22+
rustc_hir = { path = "../rustc_hir" }
23+
rustc_hir_pretty = { path = "../rustc_hir_pretty" }
24+
rustc_metadata = { path = "../rustc_metadata" }
25+
rustc_mir = { path = "../rustc_mir" }
26+
rustc_parse = { path = "../rustc_parse" }
27+
rustc_plugin_impl = { path = "../rustc_plugin_impl" }
28+
rustc_save_analysis = { path = "../rustc_save_analysis" }
29+
rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
30+
rustc_session = { path = "../rustc_session" }
31+
rustc_error_codes = { path = "../rustc_error_codes" }
32+
rustc_interface = { path = "../rustc_interface" }
33+
rustc_serialize = { path = "../rustc_serialize" }
34+
rustc_ast = { path = "../rustc_ast" }
35+
rustc_span = { path = "../rustc_span" }
36+
37+
[target.'cfg(windows)'.dependencies]
38+
winapi = { version = "0.3", features = ["consoleapi", "debugapi", "processenv"] }
39+
40+
[features]
41+
llvm = ['rustc_interface/llvm']
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/librustc_error_codes/Cargo.toml renamed to compiler/rustc_error_codes/Cargo.toml

-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,3 @@ authors = ["The Rust Project Developers"]
33
name = "rustc_error_codes"
44
version = "0.0.0"
55
edition = "2018"
6-
7-
[lib]
8-
name = "rustc_error_codes"
9-
path = "lib.rs"

0 commit comments

Comments
 (0)