Skip to content

Commit bf9c7a6

Browse files
committedFeb 28, 2024·
Auto merge of rust-lang#121741 - GuillaumeGomez:rollup-msrsrnk, r=GuillaumeGomez
Rollup of 12 pull requests Successful merges: - rust-lang#120051 (Add `display` method to `OsStr`) - rust-lang#121226 (Fix issues in suggesting importing extern crate paths) - rust-lang#121423 (Remove the `UntranslatableDiagnosticTrivial` lint.) - rust-lang#121527 (unix_sigpipe: Simple fixes and improvements in tests) - rust-lang#121572 (Add test case for primitive links in alias js) - rust-lang#121661 (Changing some attributes to only_local.) - rust-lang#121680 (Fix link generation for foreign macro in jump to definition feature) - rust-lang#121686 (Adjust printing for RPITITs) - rust-lang#121691 (handle unavailable creation time as `io::ErrorKind::Unsupported`) - rust-lang#121695 (Split rustc_type_ir to avoid rustc_ast from depending on it) - rust-lang#121698 (CFI: Fix typo in test file names) - rust-lang#121702 (Process alias-relate obligations in CoerceUnsized loop) r? `@ghost` `@rustbot` modify labels: rollup
2 parents d377991 + 1b08d1a commit bf9c7a6

File tree

58 files changed

+431
-234
lines changed

Some content is hidden

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

58 files changed

+431
-234
lines changed
 

‎Cargo.lock

+14-1
Original file line numberDiff line numberDiff line change
@@ -3417,18 +3417,29 @@ version = "0.0.0"
34173417
dependencies = [
34183418
"bitflags 2.4.2",
34193419
"memchr",
3420+
"rustc_ast_ir",
34203421
"rustc_data_structures",
34213422
"rustc_index",
34223423
"rustc_lexer",
34233424
"rustc_macros",
34243425
"rustc_serialize",
34253426
"rustc_span",
3426-
"rustc_type_ir",
34273427
"smallvec",
34283428
"thin-vec",
34293429
"tracing",
34303430
]
34313431

3432+
[[package]]
3433+
name = "rustc_ast_ir"
3434+
version = "0.0.0"
3435+
dependencies = [
3436+
"rustc_data_structures",
3437+
"rustc_macros",
3438+
"rustc_serialize",
3439+
"rustc_span",
3440+
"smallvec",
3441+
]
3442+
34323443
[[package]]
34333444
name = "rustc_ast_lowering"
34343445
version = "0.0.0"
@@ -4181,6 +4192,7 @@ dependencies = [
41814192
"rustc_apfloat",
41824193
"rustc_arena",
41834194
"rustc_ast",
4195+
"rustc_ast_ir",
41844196
"rustc_attr",
41854197
"rustc_data_structures",
41864198
"rustc_error_messages",
@@ -4661,6 +4673,7 @@ version = "0.0.0"
46614673
dependencies = [
46624674
"bitflags 2.4.2",
46634675
"derivative",
4676+
"rustc_ast_ir",
46644677
"rustc_data_structures",
46654678
"rustc_index",
46664679
"rustc_macros",

‎compiler/rustc_ast/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,13 @@ edition = "2021"
88
# tidy-alphabetical-start
99
bitflags = "2.4.1"
1010
memchr = "=2.5.0"
11+
rustc_ast_ir = { path = "../rustc_ast_ir" }
1112
rustc_data_structures = { path = "../rustc_data_structures" }
1213
rustc_index = { path = "../rustc_index" }
1314
rustc_lexer = { path = "../rustc_lexer" }
1415
rustc_macros = { path = "../rustc_macros" }
1516
rustc_serialize = { path = "../rustc_serialize" }
1617
rustc_span = { path = "../rustc_span" }
17-
# For Mutability and Movability, which could be uplifted into a common crate.
18-
rustc_type_ir = { path = "../rustc_type_ir" }
1918
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
2019
thin-vec = "0.2.12"
2120
tracing = "0.1"

0 commit comments

Comments
 (0)
Please sign in to comment.