Skip to content

Commit fa6cf3f

Browse files
borsbors
committed
Auto merge of #2970 - rust-lang:rustup2023-07-07, r=oli-obk
Automatic sync from rustc
2 parents c8b3992 + 536c910 commit fa6cf3f

File tree

572 files changed

+9954
-8888
lines changed

Some content is hidden

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

572 files changed

+9954
-8888
lines changed

‎.github/workflows/ci.yml

+4-24
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ jobs:
3737
pr:
3838
name: "PR - ${{ matrix.name }}"
3939
env:
40+
PR_CI_JOB: 1
4041
CI_JOB_NAME: "${{ matrix.name }}"
4142
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
4243
HEAD_SHA: "${{ github.event.pull_request.head.sha || github.sha }}"
@@ -211,18 +212,6 @@ jobs:
211212
- name: dist-loongarch64-linux
212213
os: ubuntu-20.04-8core-32gb
213214
env: {}
214-
- name: dist-mips-linux
215-
os: ubuntu-20.04-8core-32gb
216-
env: {}
217-
- name: dist-mips64-linux
218-
os: ubuntu-20.04-8core-32gb
219-
env: {}
220-
- name: dist-mips64el-linux
221-
os: ubuntu-20.04-8core-32gb
222-
env: {}
223-
- name: dist-mipsel-linux
224-
os: ubuntu-20.04-8core-32gb
225-
env: {}
226215
- name: dist-powerpc-linux
227216
os: ubuntu-20.04-8core-32gb
228217
env: {}
@@ -308,10 +297,6 @@ jobs:
308297
env:
309298
RUST_BACKTRACE: 1
310299
os: ubuntu-20.04-8core-32gb
311-
- name: x86_64-gnu-llvm-14-stage1
312-
env:
313-
RUST_BACKTRACE: 1
314-
os: ubuntu-20.04-8core-32gb
315300
- name: x86_64-gnu-nopt
316301
os: ubuntu-20.04-4core-16gb
317302
env: {}
@@ -400,15 +385,10 @@ jobs:
400385
RUST_CONFIGURE_ARGS: "--build=i686-pc-windows-msvc"
401386
SCRIPT: make ci-msvc
402387
os: windows-2019-8core-32gb
403-
- name: x86_64-msvc-cargo
404-
env:
405-
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo
406-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld"
407-
os: windows-2019-8core-32gb
408-
- name: x86_64-msvc-tools
388+
- name: x86_64-msvc-ext
409389
env:
410-
SCRIPT: src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
411-
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --save-toolstates=/tmp/toolstate/toolstates.json"
390+
SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
391+
RUST_CONFIGURE_ARGS: "--build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json"
412392
DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
413393
os: windows-2019-8core-32gb
414394
- name: i686-mingw

‎Cargo.lock

+21-83
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ version = "0.1.0"
335335
dependencies = [
336336
"anyhow",
337337
"curl",
338-
"indexmap 1.9.3",
338+
"indexmap 2.0.0",
339339
"serde",
340340
"serde_json",
341341
"toml 0.5.11",
@@ -433,60 +433,6 @@ dependencies = [
433433
"rustc-std-workspace-core",
434434
]
435435

436-
[[package]]
437-
name = "chalk-derive"
438-
version = "0.92.0"
439-
source = "registry+https://github.com/rust-lang/crates.io-index"
440-
checksum = "ff5053a8a42dbff5279a82423946fc56dc1253b76cf211b2b3c14b3aad4e1281"
441-
dependencies = [
442-
"proc-macro2",
443-
"quote",
444-
"syn 2.0.8",
445-
"synstructure 0.13.0",
446-
]
447-
448-
[[package]]
449-
name = "chalk-engine"
450-
version = "0.92.0"
451-
source = "registry+https://github.com/rust-lang/crates.io-index"
452-
checksum = "b9d0e18f29b8b0f4dcf7d31fe00c884af67719699e381e8dcc9d9624b1621c60"
453-
dependencies = [
454-
"chalk-derive",
455-
"chalk-ir",
456-
"chalk-solve",
457-
"rustc-hash",
458-
"tracing",
459-
]
460-
461-
[[package]]
462-
name = "chalk-ir"
463-
version = "0.92.0"
464-
source = "registry+https://github.com/rust-lang/crates.io-index"
465-
checksum = "8a56de2146a8ed0fcd54f4bd50db852f1de4eac9e1efe568494f106c21b77d2a"
466-
dependencies = [
467-
"bitflags 1.3.2",
468-
"chalk-derive",
469-
"lazy_static",
470-
]
471-
472-
[[package]]
473-
name = "chalk-solve"
474-
version = "0.92.0"
475-
source = "registry+https://github.com/rust-lang/crates.io-index"
476-
checksum = "b392e02b4c81ec76d3748da839fc70a5539b83d27c9030668463d34d5110b860"
477-
dependencies = [
478-
"chalk-derive",
479-
"chalk-ir",
480-
"ena",
481-
"indexmap 1.9.3",
482-
"itertools",
483-
"petgraph",
484-
"rustc-hash",
485-
"tracing",
486-
"tracing-subscriber",
487-
"tracing-tree",
488-
]
489-
490436
[[package]]
491437
name = "chrono"
492438
version = "0.4.26"
@@ -691,9 +637,9 @@ dependencies = [
691637

692638
[[package]]
693639
name = "compiler_builtins"
694-
version = "0.1.93"
640+
version = "0.1.95"
695641
source = "registry+https://github.com/rust-lang/crates.io-index"
696-
checksum = "76630810d973ecea3dbf611e1b7aecfb1012751ef1ff8de3998f89014a166781"
642+
checksum = "6866e0f3638013234db3c89ead7a14d278354338e7237257407500009012b23f"
697643
dependencies = [
698644
"cc",
699645
"rustc-std-workspace-core",
@@ -820,6 +766,16 @@ dependencies = [
820766
"typenum",
821767
]
822768

769+
[[package]]
770+
name = "cstr"
771+
version = "0.2.8"
772+
source = "registry+https://github.com/rust-lang/crates.io-index"
773+
checksum = "c11a39d776a3b35896711da8a04dc1835169dcd36f710878187637314e47941b"
774+
dependencies = [
775+
"proc-macro2",
776+
"quote",
777+
]
778+
823779
[[package]]
824780
name = "ctrlc"
825781
version = "3.4.0"
@@ -1168,12 +1124,6 @@ dependencies = [
11681124
"windows-sys 0.48.0",
11691125
]
11701126

1171-
[[package]]
1172-
name = "fixedbitset"
1173-
version = "0.2.0"
1174-
source = "registry+https://github.com/rust-lang/crates.io-index"
1175-
checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
1176-
11771127
[[package]]
11781128
name = "flate2"
11791129
version = "1.0.26"
@@ -1694,8 +1644,6 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
16941644
dependencies = [
16951645
"autocfg",
16961646
"hashbrown 0.12.3",
1697-
"rustc-rayon",
1698-
"serde",
16991647
]
17001648

17011649
[[package]]
@@ -1706,6 +1654,8 @@ checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
17061654
dependencies = [
17071655
"equivalent",
17081656
"hashbrown 0.14.0",
1657+
"rustc-rayon",
1658+
"serde",
17091659
]
17101660

17111661
[[package]]
@@ -2466,16 +2416,6 @@ dependencies = [
24662416
"sha2",
24672417
]
24682418

2469-
[[package]]
2470-
name = "petgraph"
2471-
version = "0.5.1"
2472-
source = "registry+https://github.com/rust-lang/crates.io-index"
2473-
checksum = "467d164a6de56270bd7c4d070df81d07beace25012d5103ced4e9ff08d6afdb7"
2474-
dependencies = [
2475-
"fixedbitset",
2476-
"indexmap 1.9.3",
2477-
]
2478-
24792419
[[package]]
24802420
name = "phf"
24812421
version = "0.10.1"
@@ -3086,6 +3026,7 @@ name = "rustc_codegen_llvm"
30863026
version = "0.0.0"
30873027
dependencies = [
30883028
"bitflags 1.3.2",
3029+
"cstr",
30893030
"libc",
30903031
"measureme",
30913032
"object",
@@ -3190,7 +3131,7 @@ dependencies = [
31903131
"cfg-if",
31913132
"elsa",
31923133
"ena",
3193-
"indexmap 1.9.3",
3134+
"indexmap 2.0.0",
31943135
"itertools",
31953136
"jobserver",
31963137
"libc",
@@ -3675,7 +3616,6 @@ name = "rustc_middle"
36753616
version = "0.0.0"
36763617
dependencies = [
36773618
"bitflags 1.3.2",
3678-
"chalk-ir",
36793619
"derive_more",
36803620
"either",
36813621
"field-offset",
@@ -3968,7 +3908,7 @@ dependencies = [
39683908
name = "rustc_serialize"
39693909
version = "0.0.0"
39703910
dependencies = [
3971-
"indexmap 1.9.3",
3911+
"indexmap 2.0.0",
39723912
"rustc_macros",
39733913
"smallvec",
39743914
"tempfile",
@@ -4008,6 +3948,7 @@ dependencies = [
40083948
"rustc_hir",
40093949
"rustc_middle",
40103950
"rustc_span",
3951+
"scoped-tls",
40113952
"tracing",
40123953
]
40133954

@@ -4016,7 +3957,7 @@ name = "rustc_span"
40163957
version = "0.0.0"
40173958
dependencies = [
40183959
"cfg-if",
4019-
"indexmap 1.9.3",
3960+
"indexmap 2.0.0",
40203961
"md-5",
40213962
"rustc_arena",
40223963
"rustc_data_structures",
@@ -4102,9 +4043,6 @@ dependencies = [
41024043
name = "rustc_traits"
41034044
version = "0.0.0"
41044045
dependencies = [
4105-
"chalk-engine",
4106-
"chalk-ir",
4107-
"chalk-solve",
41084046
"rustc_ast",
41094047
"rustc_data_structures",
41104048
"rustc_hir",
@@ -4136,6 +4074,7 @@ dependencies = [
41364074
name = "rustc_ty_utils"
41374075
version = "0.0.0"
41384076
dependencies = [
4077+
"itertools",
41394078
"rustc_data_structures",
41404079
"rustc_errors",
41414080
"rustc_fluent_macro",
@@ -5032,7 +4971,6 @@ dependencies = [
50324971
"thread_local",
50334972
"tracing",
50344973
"tracing-core",
5035-
"tracing-log",
50364974
]
50374975

50384976
[[package]]

‎compiler/rustc_ast/src/ast.rs

+9
Original file line numberDiff line numberDiff line change
@@ -2652,6 +2652,15 @@ pub struct NormalAttr {
26522652
pub tokens: Option<LazyAttrTokenStream>,
26532653
}
26542654

2655+
impl NormalAttr {
2656+
pub fn from_ident(ident: Ident) -> Self {
2657+
Self {
2658+
item: AttrItem { path: Path::from_ident(ident), args: AttrArgs::Empty, tokens: None },
2659+
tokens: None,
2660+
}
2661+
}
2662+
}
2663+
26552664
#[derive(Clone, Encodable, Decodable, Debug, HashStable_Generic)]
26562665
pub struct AttrItem {
26572666
pub path: Path,

‎compiler/rustc_ast_lowering/src/expr.rs

+1-8
Original file line numberDiff line numberDiff line change
@@ -673,14 +673,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
673673
self.lower_attrs(
674674
inner_hir_id,
675675
&[Attribute {
676-
kind: AttrKind::Normal(ptr::P(NormalAttr {
677-
item: AttrItem {
678-
path: Path::from_ident(Ident::new(sym::track_caller, span)),
679-
args: AttrArgs::Empty,
680-
tokens: None,
681-
},
682-
tokens: None,
683-
})),
676+
kind: AttrKind::Normal(ptr::P(NormalAttr::from_ident(Ident::new(sym::track_caller, span)))),
684677
id: self.tcx.sess.parse_sess.attr_id_generator.mk_attr_id(),
685678
style: AttrStyle::Outer,
686679
span: unstable_span,

0 commit comments

Comments
 (0)