Skip to content

Commit a872286

Browse files
borsbors
committed
Auto merge of #161458 - jhpratt:rollup-q1wVzyt, r=jhpratt
Rollup of 20 pull requests Successful merges: - #161259 (move some attribute related structs out of rustc_attr_ir) - #160853 (delegation: simplify matches on `FnKind`, minor refactorings) - #161161 (proc_macro: add support for 16-bit targets) - #159899 ( `GenericArgs::types` triage + possible fixes) - #160459 (Use attribute parser for `deprecated` attribute checking) - #160536 (Inline `String::into_raw_parts` and reuse `from_utf16` optimization) - #160563 (Make `BorrowedCursor<'a, T>` covariant in `'a` and drop an indirection) - #160595 (Clarify `str::split_at` docs) - #160813 (Optimize linked list iterator performance) - #161271 (doc: document safety requirements for core WTF-8) - #161317 (LLVM 24: configure float-abi via module flag) - #161320 (Only suggest `RUST_MIN_STACK` if maybe stack overflow) - #161369 (Add regression test for confusing lifetime error message issue) - #161393 (Configure LLM policy URL for triagebot) - #161403 (splat-fn-ptr-ptr-tuple.rs: add `let` to avoid UB) - #161409 (Add back `tests/rustdoc-gui/notable-trait.goml` test) - #161410 (Fix rustdoc remapping `documentation` scope documentation) - #161415 (Update expect messages in path docs to better follow guidelines) - #161438 (Change triagebot backport to ping T-libs-fcp) - #161442 (Add regression test for dead code on type alias used in impl self type) Failed merges: - #160509 (Remove `RegionExt`; move methods to `Region` in `rustc_type_ir`)
2 parents b662191 + f2667ec commit a872286

188 files changed

Lines changed: 1664 additions & 865 deletions

File tree

Some content is hidden

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

‎Cargo.lock‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3664,7 +3664,7 @@ dependencies = [
36643664
"rustc_macros",
36653665
"rustc_serialize",
36663666
"rustc_span",
3667-
"rustc_target",
3667+
"rustc_structures",
36683668
"smallvec",
36693669
"thin-vec",
36703670
"tracing",
@@ -3688,6 +3688,7 @@ dependencies = [
36883688
"rustc_parse_format",
36893689
"rustc_session",
36903690
"rustc_span",
3691+
"rustc_structures",
36913692
"rustc_target",
36923693
"thin-vec",
36933694
]
@@ -3785,6 +3786,7 @@ dependencies = [
37853786
"rustc_sanitizers",
37863787
"rustc_session",
37873788
"rustc_span",
3789+
"rustc_structures",
37883790
"rustc_symbol_mangling",
37893791
"rustc_target",
37903792
"smallvec",
@@ -3824,6 +3826,7 @@ dependencies = [
38243826
"rustc_serialize",
38253827
"rustc_session",
38263828
"rustc_span",
3829+
"rustc_structures",
38273830
"rustc_symbol_mangling",
38283831
"rustc_target",
38293832
"rustc_trait_selection",
@@ -3855,6 +3858,7 @@ dependencies = [
38553858
"rustc_mir_dataflow",
38563859
"rustc_session",
38573860
"rustc_span",
3861+
"rustc_structures",
38583862
"rustc_target",
38593863
"rustc_trait_selection",
38603864
"tracing",
@@ -3871,6 +3875,7 @@ dependencies = [
38713875
"rustc_macros",
38723876
"rustc_serialize",
38733877
"rustc_span",
3878+
"rustc_structures",
38743879
]
38753880

38763881
[[package]]
@@ -3949,6 +3954,7 @@ dependencies = [
39493954
"rustc_resolve",
39503955
"rustc_session",
39513956
"rustc_span",
3957+
"rustc_structures",
39523958
"rustc_target",
39533959
"serde_json",
39543960
"shlex",
@@ -4023,6 +4029,7 @@ dependencies = [
40234029
"rustc_serialize",
40244030
"rustc_session",
40254031
"rustc_span",
4032+
"rustc_structures",
40264033
"scoped-tls",
40274034
"smallvec",
40284035
"thin-vec",
@@ -4098,6 +4105,7 @@ dependencies = [
40984105
"rustc_middle",
40994106
"rustc_session",
41004107
"rustc_span",
4108+
"rustc_structures",
41014109
"rustc_target",
41024110
"rustc_trait_selection",
41034111
"smallvec",
@@ -4251,6 +4259,7 @@ dependencies = [
42514259
"rustc_resolve",
42524260
"rustc_session",
42534261
"rustc_span",
4262+
"rustc_structures",
42544263
"rustc_symbol_mangling",
42554264
"rustc_target",
42564265
"rustc_thread_pool",
@@ -4292,6 +4301,7 @@ dependencies = [
42924301
"rustc_parse_format",
42934302
"rustc_session",
42944303
"rustc_span",
4304+
"rustc_structures",
42954305
"rustc_symbol_mangling",
42964306
"rustc_target",
42974307
"rustc_trait_selection",
@@ -4373,6 +4383,7 @@ dependencies = [
43734383
"rustc_serialize",
43744384
"rustc_session",
43754385
"rustc_span",
4386+
"rustc_structures",
43764387
"rustc_target",
43774388
"tempfile",
43784389
"tracing",
@@ -4405,6 +4416,7 @@ dependencies = [
44054416
"rustc_serialize",
44064417
"rustc_session",
44074418
"rustc_span",
4419+
"rustc_structures",
44084420
"rustc_target",
44094421
"rustc_thread_pool",
44104422
"rustc_type_ir",
@@ -4476,6 +4488,7 @@ dependencies = [
44764488
"rustc_mir_dataflow",
44774489
"rustc_session",
44784490
"rustc_span",
4491+
"rustc_structures",
44794492
"rustc_target",
44804493
"rustc_trait_selection",
44814494
"smallvec",
@@ -4498,6 +4511,7 @@ dependencies = [
44984511
"rustc_serialize",
44994512
"rustc_session",
45004513
"rustc_span",
4514+
"rustc_structures",
45014515
"rustc_symbol_mangling",
45024516
"rustc_target",
45034517
"serde",
@@ -4571,6 +4585,7 @@ dependencies = [
45714585
"rustc_privacy",
45724586
"rustc_session",
45734587
"rustc_span",
4588+
"rustc_structures",
45744589
"rustc_target",
45754590
"rustc_trait_selection",
45764591
"tracing",
@@ -4663,6 +4678,7 @@ dependencies = [
46634678
"rustc_middle",
46644679
"rustc_serialize",
46654680
"rustc_span",
4681+
"rustc_structures",
46664682
"rustc_thread_pool",
46674683
"tracing",
46684684
]
@@ -4690,6 +4706,7 @@ dependencies = [
46904706
"rustc_middle",
46914707
"rustc_session",
46924708
"rustc_span",
4709+
"rustc_structures",
46934710
"smallvec",
46944711
"thin-vec",
46954712
"tracing",
@@ -4731,7 +4748,6 @@ dependencies = [
47314748
"libc",
47324749
"rustc_abi",
47334750
"rustc_ast",
4734-
"rustc_attr_ir",
47354751
"rustc_data_structures",
47364752
"rustc_errors",
47374753
"rustc_feature",
@@ -4741,6 +4757,7 @@ dependencies = [
47414757
"rustc_macros",
47424758
"rustc_serialize",
47434759
"rustc_span",
4760+
"rustc_structures",
47444761
"rustc_target",
47454762
"termize",
47464763
"tracing",
@@ -4770,6 +4787,20 @@ dependencies = [
47704787
"unicode-width 0.2.2",
47714788
]
47724789

4790+
[[package]]
4791+
name = "rustc_structures"
4792+
version = "0.0.0"
4793+
dependencies = [
4794+
"bitflags",
4795+
"rustc_data_structures",
4796+
"rustc_error_messages",
4797+
"rustc_macros",
4798+
"rustc_serialize",
4799+
"rustc_span",
4800+
"schemars",
4801+
"serde",
4802+
]
4803+
47734804
[[package]]
47744805
name = "rustc_symbol_mangling"
47754806
version = "0.0.0"
@@ -4800,6 +4831,7 @@ dependencies = [
48004831
"rustc_macros",
48014832
"rustc_serialize",
48024833
"rustc_span",
4834+
"rustc_structures",
48034835
"schemars",
48044836
"serde",
48054837
"serde_derive",
@@ -4849,6 +4881,7 @@ dependencies = [
48494881
"rustc_next_trait_solver",
48504882
"rustc_session",
48514883
"rustc_span",
4884+
"rustc_structures",
48524885
"rustc_transmute",
48534886
"smallvec",
48544887
"thin-vec",
@@ -4897,6 +4930,7 @@ dependencies = [
48974930
"rustc_middle",
48984931
"rustc_session",
48994932
"rustc_span",
4933+
"rustc_structures",
49004934
"rustc_target",
49014935
"rustc_trait_selection",
49024936
"rustc_ty_walk",

‎compiler/rustc_ast/src/visit.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
1616
pub use rustc_ast_ir::visit::VisitorResult;
1717
pub use rustc_ast_ir::{try_visit, visit_opt, walk_list, walk_visitable_list};
18+
use rustc_macros::StableHash;
1819
use rustc_span::{Ident, Span, Spanned, Symbol};
1920
use thin_vec::ThinVec;
2021

2122
use crate::ast::*;
2223
use crate::tokenstream::DelimSpan;
2324

24-
#[derive(Copy, Clone, Debug, PartialEq)]
25+
#[derive(Copy, Clone, Debug, PartialEq, Eq, StableHash)]
2526
pub enum AssocCtxt {
2627
Trait,
2728
Impl { of_trait: bool },

‎compiler/rustc_attr_ir/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ rustc_error_messages = { path = "../rustc_error_messages" }
1313
rustc_macros = { path = "../rustc_macros" }
1414
rustc_serialize = { path = "../rustc_serialize" }
1515
rustc_span = { path = "../rustc_span" }
16-
rustc_target = { path = "../rustc_target" }
16+
rustc_structures = { path = "../rustc_structures" }
1717
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
1818
thin-vec = "0.2.18"
1919
tracing = "0.1"

0 commit comments

Comments
 (0)