Skip to content

Commit 3c91be7

Browse files
committed
Auto merge of #145923 - matthiaskrgr:rollup-rkejtos, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #144274 (add Option::reduce) - #145562 (Simplify macro generating ToString implementations for `&…&str`) - #145625 (improve float to_degrees/to_radians rounding comments and impl) - #145740 (Introduce a `[workspace.dependencies`] section in the top-level `Cargo.toml`) - #145885 (Inherit TCC in debuginfo tests on macOS) - #145905 (Stop calling unwrap when format foreign has trailing dollar) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b2dd217 + bd90013 commit 3c91be7

File tree

70 files changed

+302
-167
lines changed

Some content is hidden

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

70 files changed

+302
-167
lines changed

Cargo.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,16 @@ exclude = [
5959
"obj",
6060
]
6161

62+
[workspace.dependencies]
63+
# tidy-alphabetical-start
64+
bitflags = "2.9.3"
65+
itertools = "0.12.1"
66+
memchr = "2.7.5"
67+
rustc-literal-escaper = "0.0.5"
68+
thin-vec = "0.2.14"
69+
tracing = "0.1.37"
70+
# tidy-alphabetical-end
71+
6272
[profile.release.package.rustc_thread_pool]
6373
# The rustc fork of Rayon has deadlock detection code which intermittently
6474
# causes overflows in the CI (see https://github.com/rust-lang/rust/issues/90227)

compiler/rustc_abi/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start
8-
bitflags = "2.4.1"
8+
bitflags.workspace = true
99
rand = { version = "0.9.0", default-features = false, optional = true }
1010
rand_xoshiro = { version = "0.7.0", optional = true }
1111
rustc_data_structures = { path = "../rustc_data_structures", optional = true }
@@ -15,7 +15,7 @@ rustc_index = { path = "../rustc_index", default-features = false }
1515
rustc_macros = { path = "../rustc_macros", optional = true }
1616
rustc_serialize = { path = "../rustc_serialize", optional = true }
1717
rustc_span = { path = "../rustc_span", optional = true }
18-
tracing = "0.1"
18+
tracing.workspace = true
1919
# tidy-alphabetical-end
2020

2121
[features]

compiler/rustc_ast/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start
8-
bitflags = "2.4.1"
9-
memchr = "2.7.4"
10-
rustc-literal-escaper = "0.0.5"
8+
bitflags.workspace = true
9+
memchr.workspace = true
10+
rustc-literal-escaper.workspace = true
1111
rustc_ast_ir = { path = "../rustc_ast_ir" }
1212
rustc_data_structures = { path = "../rustc_data_structures" }
1313
rustc_index = { path = "../rustc_index" }
1414
rustc_macros = { path = "../rustc_macros" }
1515
rustc_serialize = { path = "../rustc_serialize" }
1616
rustc_span = { path = "../rustc_span" }
1717
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
18-
thin-vec = "0.2.12"
18+
thin-vec.workspace = true
1919
tracing = "0.1"
2020
# tidy-alphabetical-end

compiler/rustc_ast_lowering/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ rustc_session = { path = "../rustc_session" }
2424
rustc_span = { path = "../rustc_span" }
2525
rustc_target = { path = "../rustc_target" }
2626
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
27-
thin-vec = "0.2.12"
28-
tracing = "0.1"
27+
thin-vec.workspace = true
28+
tracing.workspace = true
2929
# tidy-alphabetical-end

compiler/rustc_ast_passes/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start
8-
itertools = "0.12"
8+
itertools.workspace = true
99
rustc_abi = { path = "../rustc_abi" }
1010
rustc_ast = { path = "../rustc_ast" }
1111
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
@@ -18,5 +18,5 @@ rustc_macros = { path = "../rustc_macros" }
1818
rustc_session = { path = "../rustc_session" }
1919
rustc_span = { path = "../rustc_span" }
2020
rustc_target = { path = "../rustc_target" }
21-
thin-vec = "0.2.12"
21+
thin-vec.workspace = true
2222
# tidy-alphabetical-end

compiler/rustc_ast_pretty/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start
8-
itertools = "0.12"
8+
itertools.workspace = true
99
rustc_ast = { path = "../rustc_ast" }
1010
rustc_lexer = { path = "../rustc_lexer" }
1111
rustc_span = { path = "../rustc_span" }
1212
# tidy-alphabetical-end
1313

1414
[dev-dependencies]
1515
# tidy-alphabetical-start
16-
thin-vec = "0.2.12"
16+
thin-vec.workspace = true
1717
# tidy-alphabetical-end

compiler/rustc_attr_parsing/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ rustc_macros = { path = "../rustc_macros" }
1717
rustc_parse = { path = "../rustc_parse" }
1818
rustc_session = { path = "../rustc_session" }
1919
rustc_span = { path = "../rustc_span" }
20-
thin-vec = "0.2.12"
20+
thin-vec.workspace = true
2121
# tidy-alphabetical-end

compiler/rustc_borrowck/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ edition = "2024"
66
[dependencies]
77
# tidy-alphabetical-start
88
either = "1.5.0"
9-
itertools = "0.12"
9+
itertools.workspace = true
1010
polonius-engine = "0.13.0"
1111
rustc_abi = { path = "../rustc_abi" }
1212
rustc_data_structures = { path = "../rustc_data_structures" }
@@ -25,5 +25,5 @@ rustc_span = { path = "../rustc_span" }
2525
rustc_trait_selection = { path = "../rustc_trait_selection" }
2626
rustc_traits = { path = "../rustc_traits" }
2727
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
28-
tracing = "0.1"
28+
tracing.workspace = true
2929
# tidy-alphabetical-end

compiler/rustc_builtin_macros/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ rustc_session = { path = "../rustc_session" }
3030
rustc_span = { path = "../rustc_span" }
3131
rustc_target = { path = "../rustc_target" }
3232
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
33-
thin-vec = "0.2.12"
34-
tracing = "0.1"
33+
thin-vec.workspace = true
34+
tracing.workspace = true
3535
# tidy-alphabetical-end

compiler/rustc_builtin_macros/src/format_foreign.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ pub(crate) mod printf {
416416
// Yes, this *is* the parameter.
417417
Some(('$', end2)) => {
418418
state = Flags;
419-
parameter = Some(at.slice_between(end).unwrap().parse().unwrap());
419+
parameter = at.slice_between(end).unwrap().parse().ok();
420420
move_to!(end2);
421421
}
422422
// Wait, no, actually, it's the width.

0 commit comments

Comments
 (0)