Skip to content

Commit 8deed11

Browse files
borsbors
committed
Auto merge of rust-lang#2782 - RalfJung:rustup, r=RalfJung
Rustup
2 parents 0d225bc + 73a3666 commit 8deed11

File tree

198 files changed

+2236
-1297
lines changed

Some content is hidden

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

198 files changed

+2236
-1297
lines changed

‎.github/ISSUE_TEMPLATE/ice.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Internal Compiler Error (Structured form)
1+
name: Internal Compiler Error (for use by automated tooling)
22
description: For now, you'll want to use the other ICE template, as GitHub forms have strict limits on the size of fields so backtraces cannot be pasted directly.
33
labels: ["C-bug", "I-ICE", "T-compiler"]
44
title: "[ICE]: "

‎.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@ jobs:
6060
env: {}
6161
- name: x86_64-gnu-tools
6262
tidy: false
63-
env:
64-
CI_ONLY_WHEN_SUBMODULES_CHANGED: 1
6563
os: ubuntu-20.04-xl
64+
env: {}
6665
timeout-minutes: 600
6766
runs-on: "${{ matrix.os }}"
6867
steps:

‎Cargo.lock

Lines changed: 76 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,12 @@ version = "1.0.3"
127127
source = "registry+https://github.com/rust-lang/crates.io-index"
128128
checksum = "8f8cb5d814eb646a863c4f24978cff2880c4be96ad8cde2c0f0678732902e271"
129129

130+
[[package]]
131+
name = "arrayvec"
132+
version = "0.5.2"
133+
source = "registry+https://github.com/rust-lang/crates.io-index"
134+
checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
135+
130136
[[package]]
131137
name = "arrayvec"
132138
version = "0.7.0"
@@ -407,7 +413,7 @@ dependencies = [
407413
"unicode-xid",
408414
"url",
409415
"walkdir",
410-
"winapi",
416+
"windows-sys 0.45.0",
411417
]
412418

413419
[[package]]
@@ -436,7 +442,7 @@ name = "cargo-credential-wincred"
436442
version = "0.2.0"
437443
dependencies = [
438444
"cargo-credential",
439-
"winapi",
445+
"windows-sys 0.45.0",
440446
]
441447

442448
[[package]]
@@ -496,7 +502,7 @@ dependencies = [
496502
"time 0.3.17",
497503
"toml_edit",
498504
"url",
499-
"winapi",
505+
"windows-sys 0.45.0",
500506
]
501507

502508
[[package]]
@@ -516,7 +522,7 @@ dependencies = [
516522
"shell-escape",
517523
"tempfile",
518524
"walkdir",
519-
"winapi",
525+
"windows-sys 0.45.0",
520526
]
521527

522528
[[package]]
@@ -791,7 +797,7 @@ dependencies = [
791797
name = "clippy_utils"
792798
version = "0.1.69"
793799
dependencies = [
794-
"arrayvec",
800+
"arrayvec 0.7.0",
795801
"if_chain",
796802
"itertools",
797803
"rustc-semver",
@@ -2217,7 +2223,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
22172223
checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
22182224
dependencies = [
22192225
"libc",
2220-
"windows-sys",
2226+
"windows-sys 0.42.0",
22212227
]
22222228

22232229
[[package]]
@@ -2229,7 +2235,7 @@ dependencies = [
22292235
"hermit-abi 0.2.6",
22302236
"io-lifetimes",
22312237
"rustix",
2232-
"windows-sys",
2238+
"windows-sys 0.42.0",
22332239
]
22342240

22352241
[[package]]
@@ -2670,7 +2676,7 @@ version = "0.5.0"
26702676
source = "registry+https://github.com/rust-lang/crates.io-index"
26712677
checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123"
26722678
dependencies = [
2673-
"windows-sys",
2679+
"windows-sys 0.42.0",
26742680
]
26752681

26762682
[[package]]
@@ -2987,7 +2993,7 @@ dependencies = [
29872993
"libc",
29882994
"redox_syscall",
29892995
"smallvec",
2990-
"windows-sys",
2996+
"windows-sys 0.42.0",
29912997
]
29922998

29932999
[[package]]
@@ -3912,7 +3918,7 @@ dependencies = [
39123918
name = "rustc_data_structures"
39133919
version = "0.0.0"
39143920
dependencies = [
3915-
"arrayvec",
3921+
"arrayvec 0.7.0",
39163922
"bitflags",
39173923
"cfg-if",
39183924
"ena",
@@ -4169,7 +4175,7 @@ dependencies = [
41694175
name = "rustc_index"
41704176
version = "0.0.0"
41714177
dependencies = [
4172-
"arrayvec",
4178+
"arrayvec 0.7.0",
41734179
"rustc_macros",
41744180
"rustc_serialize",
41754181
"smallvec",
@@ -4866,7 +4872,7 @@ dependencies = [
48664872
name = "rustdoc"
48674873
version = "0.0.0"
48684874
dependencies = [
4869-
"arrayvec",
4875+
"arrayvec 0.7.0",
48704876
"askama",
48714877
"expect-test",
48724878
"itertools",
@@ -4969,7 +4975,7 @@ dependencies = [
49694975
"io-lifetimes",
49704976
"libc",
49714977
"linux-raw-sys",
4972-
"windows-sys",
4978+
"windows-sys 0.42.0",
49734979
]
49744980

49754981
[[package]]
@@ -5375,9 +5381,9 @@ dependencies = [
53755381

53765382
[[package]]
53775383
name = "strip-ansi-escapes"
5378-
version = "0.1.0"
5384+
version = "0.1.1"
53795385
source = "registry+https://github.com/rust-lang/crates.io-index"
5380-
checksum = "9d63676e2abafa709460982ddc02a3bb586b6d15a49b75c212e06edd3933acee"
5386+
checksum = "011cbb39cf7c1f62871aea3cc46e5817b0937b49e9447370c93cacbe93a766d8"
53815387
dependencies = [
53825388
"vte",
53835389
]
@@ -5499,7 +5505,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
54995505
checksum = "cb20089a8ba2b69debd491f8d2d023761cbf196e999218c591fa1e7e15a21907"
55005506
dependencies = [
55015507
"rustix",
5502-
"windows-sys",
5508+
"windows-sys 0.42.0",
55035509
]
55045510

55055511
[[package]]
@@ -6089,9 +6095,9 @@ checksum = "05e42f7c18b8f902290b009cde6d651262f956c98bc51bca4cd1d511c9cd85c7"
60896095

60906096
[[package]]
60916097
name = "utf8parse"
6092-
version = "0.1.1"
6098+
version = "0.2.0"
60936099
source = "registry+https://github.com/rust-lang/crates.io-index"
6094-
checksum = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d"
6100+
checksum = "936e4b492acfd135421d8dca4b1aa80a7bfc26e702ef3af710e0752684df5372"
60956101

60966102
[[package]]
60976103
name = "uuid"
@@ -6122,11 +6128,23 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
61226128

61236129
[[package]]
61246130
name = "vte"
6125-
version = "0.3.3"
6131+
version = "0.10.1"
61266132
source = "registry+https://github.com/rust-lang/crates.io-index"
6127-
checksum = "4f42f536e22f7fcbb407639765c8fd78707a33109301f834a594758bedd6e8cf"
6133+
checksum = "6cbce692ab4ca2f1f3047fcf732430249c0e971bfdd2b234cf2c47ad93af5983"
61286134
dependencies = [
6135+
"arrayvec 0.5.2",
61296136
"utf8parse",
6137+
"vte_generate_state_changes",
6138+
]
6139+
6140+
[[package]]
6141+
name = "vte_generate_state_changes"
6142+
version = "0.1.1"
6143+
source = "registry+https://github.com/rust-lang/crates.io-index"
6144+
checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
6145+
dependencies = [
6146+
"proc-macro2",
6147+
"quote",
61306148
]
61316149

61326150
[[package]]
@@ -6251,47 +6269,71 @@ dependencies = [
62516269
"windows_x86_64_msvc",
62526270
]
62536271

6272+
[[package]]
6273+
name = "windows-sys"
6274+
version = "0.45.0"
6275+
source = "registry+https://github.com/rust-lang/crates.io-index"
6276+
checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
6277+
dependencies = [
6278+
"windows-targets",
6279+
]
6280+
6281+
[[package]]
6282+
name = "windows-targets"
6283+
version = "0.42.1"
6284+
source = "registry+https://github.com/rust-lang/crates.io-index"
6285+
checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7"
6286+
dependencies = [
6287+
"windows_aarch64_gnullvm",
6288+
"windows_aarch64_msvc",
6289+
"windows_i686_gnu",
6290+
"windows_i686_msvc",
6291+
"windows_x86_64_gnu",
6292+
"windows_x86_64_gnullvm",
6293+
"windows_x86_64_msvc",
6294+
]
6295+
62546296
[[package]]
62556297
name = "windows_aarch64_gnullvm"
6256-
version = "0.42.0"
6298+
version = "0.42.1"
62576299
source = "registry+https://github.com/rust-lang/crates.io-index"
6258-
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
6300+
checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"
62596301

62606302
[[package]]
62616303
name = "windows_aarch64_msvc"
6262-
version = "0.42.0"
6304+
version = "0.42.1"
62636305
source = "registry+https://github.com/rust-lang/crates.io-index"
6264-
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
6306+
checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"
62656307

62666308
[[package]]
62676309
name = "windows_i686_gnu"
6268-
version = "0.42.0"
6310+
version = "0.42.1"
62696311
source = "registry+https://github.com/rust-lang/crates.io-index"
6270-
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
6312+
checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"
62716313

62726314
[[package]]
62736315
name = "windows_i686_msvc"
6274-
version = "0.42.0"
6316+
version = "0.42.1"
62756317
source = "registry+https://github.com/rust-lang/crates.io-index"
6276-
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
6318+
checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"
62776319

62786320
[[package]]
62796321
name = "windows_x86_64_gnu"
6280-
version = "0.42.0"
6322+
version = "0.42.1"
62816323
source = "registry+https://github.com/rust-lang/crates.io-index"
6282-
checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
6324+
checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"
62836325

62846326
[[package]]
62856327
name = "windows_x86_64_gnullvm"
6286-
version = "0.42.0"
6328+
version = "0.42.1"
62876329
source = "registry+https://github.com/rust-lang/crates.io-index"
6288-
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
6330+
checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"
62896331

62906332
[[package]]
62916333
name = "windows_x86_64_msvc"
6292-
version = "0.42.0"
6334+
version = "0.42.1"
62936335
source = "registry+https://github.com/rust-lang/crates.io-index"
6294-
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
6336+
checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
62956337

62966338
[[package]]
62976339
name = "writeable"

‎compiler/rustc_ast_pretty/src/pprust/state.rs

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1567,8 +1567,18 @@ impl<'a> State<'a> {
15671567

15681568
match bound {
15691569
GenericBound::Trait(tref, modifier) => {
1570-
if modifier == &TraitBoundModifier::Maybe {
1571-
self.word("?");
1570+
match modifier {
1571+
TraitBoundModifier::None => {}
1572+
TraitBoundModifier::Maybe => {
1573+
self.word("?");
1574+
}
1575+
TraitBoundModifier::MaybeConst => {
1576+
self.word_space("~const");
1577+
}
1578+
TraitBoundModifier::MaybeConstMaybe => {
1579+
self.word_space("~const");
1580+
self.word("?");
1581+
}
15721582
}
15731583
self.print_poly_trait_ref(tref);
15741584
}

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -803,6 +803,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
803803
predicates
804804
.iter()
805805
.map(|(param, constraint)| (param.name.as_str(), &**constraint, None)),
806+
None,
806807
);
807808
}
808809
}

‎compiler/rustc_borrowck/src/diagnostics/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
11391139
if let ty::Adt(def, substs) = ty.kind()
11401140
&& Some(def.did()) == tcx.lang_items().pin_type()
11411141
&& let ty::Ref(_, _, hir::Mutability::Mut) = substs.type_at(0).kind()
1142-
&& let self_ty = infcx.replace_bound_vars_with_fresh_vars(
1142+
&& let self_ty = infcx.instantiate_binder_with_fresh_vars(
11431143
fn_call_span,
11441144
LateBoundRegionConversionTime::FnCall,
11451145
tcx.fn_sig(method_did).subst(tcx, method_substs).input(0),

‎compiler/rustc_borrowck/src/type_check/constraint_conversion.rs

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,8 @@ impl<'a, 'tcx> ConstraintConversion<'a, 'tcx> {
8383
}
8484
self.constraints.member_constraints = tmp;
8585

86-
for (predicate, constraint_category) in outlives {
87-
// At the moment, we never generate any "higher-ranked"
88-
// region constraints like `for<'a> 'a: 'b`. At some point
89-
// when we move to universes, we will, and this assertion
90-
// will start to fail.
91-
let predicate = predicate.no_bound_vars().unwrap_or_else(|| {
92-
bug!("query_constraint {:?} contained bound vars", predicate,);
93-
});
94-
95-
self.convert(predicate, *constraint_category);
86+
for &(predicate, constraint_category) in outlives {
87+
self.convert(predicate, constraint_category);
9688
}
9789
}
9890

‎compiler/rustc_borrowck/src/type_check/input_output.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
3838
// so that they represent the view from "inside" the closure.
3939
let user_provided_sig = self
4040
.instantiate_canonical_with_fresh_inference_vars(body.span, &user_provided_poly_sig);
41-
let user_provided_sig = self.infcx.replace_bound_vars_with_fresh_vars(
41+
let user_provided_sig = self.infcx.instantiate_binder_with_fresh_vars(
4242
body.span,
4343
LateBoundRegionConversionTime::FnCall,
4444
user_provided_sig,

‎compiler/rustc_builtin_macros/src/deriving/debug.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,10 @@ fn show_substructure(cx: &mut ExtCtxt<'_>, span: Span, substr: &Substructure<'_>
153153
let path_debug = cx.path_global(span, cx.std_path(&[sym::fmt, sym::Debug]));
154154
let ty_dyn_debug = cx.ty(
155155
span,
156-
ast::TyKind::TraitObject(vec![cx.trait_bound(path_debug)], ast::TraitObjectSyntax::Dyn),
156+
ast::TyKind::TraitObject(
157+
vec![cx.trait_bound(path_debug, false)],
158+
ast::TraitObjectSyntax::Dyn,
159+
),
157160
);
158161
let ty_slice = cx.ty(
159162
span,

0 commit comments

Comments
 (0)