Skip to content

Commit fad8d28

Browse files
committed
Fix doc tests
1 parent 506df6e commit fad8d28

File tree

12 files changed

+106
-90
lines changed

12 files changed

+106
-90
lines changed

Cargo.lock

+71-62
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ dependencies = [
207207

208208
[[package]]
209209
name = "base16ct"
210-
version = "0.1.1"
210+
version = "0.2.0"
211211
source = "registry+https://github.com/rust-lang/crates.io-index"
212-
checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce"
212+
checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
213213

214214
[[package]]
215215
name = "base64"
@@ -219,9 +219,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
219219

220220
[[package]]
221221
name = "base64ct"
222-
version = "1.5.3"
222+
version = "1.6.0"
223223
source = "registry+https://github.com/rust-lang/crates.io-index"
224-
checksum = "b645a089122eccb6111b4f81cbc1a49f5900ac4666bb93ac027feaecf15607bf"
224+
checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
225225

226226
[[package]]
227227
name = "bitflags"
@@ -397,7 +397,7 @@ dependencies = [
397397
"tar",
398398
"tempfile",
399399
"termcolor",
400-
"time 0.3.17",
400+
"time 0.3.20",
401401
"toml 0.7.2",
402402
"toml_edit",
403403
"unicode-width",
@@ -490,7 +490,7 @@ dependencies = [
490490
"snapbox",
491491
"tar",
492492
"termcolor",
493-
"time 0.3.17",
493+
"time 0.3.20",
494494
"toml 0.7.2",
495495
"url",
496496
"windows-sys 0.45.0",
@@ -939,9 +939,9 @@ checksum = "82a90734b3d5dcf656e7624cca6bce9c3a90ee11f900e80141a7427ccfb3d317"
939939

940940
[[package]]
941941
name = "const-oid"
942-
version = "0.9.1"
942+
version = "0.9.2"
943943
source = "registry+https://github.com/rust-lang/crates.io-index"
944-
checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b"
944+
checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
945945

946946
[[package]]
947947
name = "content_inspector"
@@ -1061,9 +1061,9 @@ dependencies = [
10611061

10621062
[[package]]
10631063
name = "crypto-bigint"
1064-
version = "0.4.9"
1064+
version = "0.5.0"
10651065
source = "registry+https://github.com/rust-lang/crates.io-index"
1066-
checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef"
1066+
checksum = "071c0f5945634bc9ba7a452f492377dd6b1993665ddb58f28704119b32f07a9a"
10671067
dependencies = [
10681068
"generic-array",
10691069
"rand_core",
@@ -1167,9 +1167,9 @@ dependencies = [
11671167

11681168
[[package]]
11691169
name = "der"
1170-
version = "0.6.1"
1170+
version = "0.7.0"
11711171
source = "registry+https://github.com/rust-lang/crates.io-index"
1172-
checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de"
1172+
checksum = "bc302fd9b18d66834a6f092d10ea85489c0ca8ad6b7304092135fab171d853cd"
11731173
dependencies = [
11741174
"const-oid",
11751175
"pem-rfc7468",
@@ -1303,9 +1303,9 @@ checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541"
13031303

13041304
[[package]]
13051305
name = "ecdsa"
1306-
version = "0.14.8"
1306+
version = "0.16.0"
13071307
source = "registry+https://github.com/rust-lang/crates.io-index"
1308-
checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c"
1308+
checksum = "cbcfcadd7eade8d8f960aa721e9731a50081694d3118c80eba744cbf68c7e5db"
13091309
dependencies = [
13101310
"der",
13111311
"elliptic-curve",
@@ -1342,13 +1342,12 @@ dependencies = [
13421342

13431343
[[package]]
13441344
name = "elliptic-curve"
1345-
version = "0.12.3"
1345+
version = "0.13.1"
13461346
source = "registry+https://github.com/rust-lang/crates.io-index"
1347-
checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3"
1347+
checksum = "b984fcbd8df0166b077ec083cbfe076fdffb6e2de92d966794fd060794b620d7"
13481348
dependencies = [
13491349
"base16ct",
13501350
"crypto-bigint",
1351-
"der",
13521351
"digest",
13531352
"ff",
13541353
"generic-array",
@@ -1493,19 +1492,19 @@ dependencies = [
14931492

14941493
[[package]]
14951494
name = "ff"
1496-
version = "0.12.1"
1495+
version = "0.13.0"
14971496
source = "registry+https://github.com/rust-lang/crates.io-index"
1498-
checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
1497+
checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
14991498
dependencies = [
15001499
"rand_core",
15011500
"subtle",
15021501
]
15031502

15041503
[[package]]
15051504
name = "fiat-crypto"
1506-
version = "0.1.17"
1505+
version = "0.1.18"
15071506
source = "registry+https://github.com/rust-lang/crates.io-index"
1508-
checksum = "a214f5bb88731d436478f3ae1f8a277b62124089ba9fb67f4f93fb100ef73c90"
1507+
checksum = "54b2f3c51e4dd999930845da5d10a48775b8fe4ca9f4f9ec1f9161f334da5dfe"
15091508

15101509
[[package]]
15111510
name = "filetime"
@@ -1745,12 +1744,13 @@ dependencies = [
17451744

17461745
[[package]]
17471746
name = "generic-array"
1748-
version = "0.14.4"
1747+
version = "0.14.6"
17491748
source = "registry+https://github.com/rust-lang/crates.io-index"
1750-
checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817"
1749+
checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
17511750
dependencies = [
17521751
"typenum",
17531752
"version_check",
1753+
"zeroize",
17541754
]
17551755

17561756
[[package]]
@@ -1839,9 +1839,9 @@ dependencies = [
18391839

18401840
[[package]]
18411841
name = "group"
1842-
version = "0.12.1"
1842+
version = "0.13.0"
18431843
source = "registry+https://github.com/rust-lang/crates.io-index"
1844-
checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
1844+
checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
18451845
dependencies = [
18461846
"ff",
18471847
"rand_core",
@@ -2701,15 +2701,6 @@ dependencies = [
27012701
"version_check",
27022702
]
27032703

2704-
[[package]]
2705-
name = "nom8"
2706-
version = "0.2.0"
2707-
source = "registry+https://github.com/rust-lang/crates.io-index"
2708-
checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8"
2709-
dependencies = [
2710-
"memchr",
2711-
]
2712-
27132704
[[package]]
27142705
name = "normalize-line-endings"
27152706
version = "0.3.0"
@@ -2849,9 +2840,9 @@ dependencies = [
28492840

28502841
[[package]]
28512842
name = "orion"
2852-
version = "0.17.3"
2843+
version = "0.17.4"
28532844
source = "registry+https://github.com/rust-lang/crates.io-index"
2854-
checksum = "f2baf7fd2e326e3895c681176788dd227fcd8369350e53c570592d8563fecbb6"
2845+
checksum = "cbe74a766292f94f7e69db5a7bf010eadd944f24186c463fe578a7e637582066"
28552846
dependencies = [
28562847
"fiat-crypto",
28572848
"subtle",
@@ -2892,12 +2883,13 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
28922883

28932884
[[package]]
28942885
name = "p384"
2895-
version = "0.11.2"
2886+
version = "0.13.0"
28962887
source = "registry+https://github.com/rust-lang/crates.io-index"
2897-
checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa"
2888+
checksum = "70786f51bcc69f6a4c0360e063a4cac5419ef7c5cd5b3c99ad70f3be5ba79209"
28982889
dependencies = [
28992890
"ecdsa",
29002891
"elliptic-curve",
2892+
"primeorder",
29012893
"sha2",
29022894
]
29032895

@@ -2984,9 +2976,9 @@ dependencies = [
29842976

29852977
[[package]]
29862978
name = "pasetors"
2987-
version = "0.6.5"
2979+
version = "0.6.6"
29882980
source = "registry+https://github.com/rust-lang/crates.io-index"
2989-
checksum = "ed20c4c21d893414f42e0cbfebe8a8036b5ae9b0264611fb6504e395eda6ceec"
2981+
checksum = "824bf633b85dc1dece2eb07161627ba5d90a951597cd5dbf8d85f4d82b7aea69"
29902982
dependencies = [
29912983
"ct-codecs",
29922984
"ed25519-compact",
@@ -2999,7 +2991,7 @@ dependencies = [
29992991
"serde_json",
30002992
"sha2",
30012993
"subtle",
3002-
"time 0.3.17",
2994+
"time 0.3.20",
30032995
"zeroize",
30042996
]
30052997

@@ -3011,9 +3003,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
30113003

30123004
[[package]]
30133005
name = "pem-rfc7468"
3014-
version = "0.6.0"
3006+
version = "0.7.0"
30153007
source = "registry+https://github.com/rust-lang/crates.io-index"
3016-
checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac"
3008+
checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
30173009
dependencies = [
30183010
"base64ct",
30193011
]
@@ -3139,9 +3131,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
31393131

31403132
[[package]]
31413133
name = "pkcs8"
3142-
version = "0.9.0"
3134+
version = "0.10.1"
31433135
source = "registry+https://github.com/rust-lang/crates.io-index"
3144-
checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba"
3136+
checksum = "3d2820d87d2b008616e5c27212dd9e0e694fb4c6b522de06094106813328cb49"
31453137
dependencies = [
31463138
"der",
31473139
"spki",
@@ -3198,6 +3190,15 @@ dependencies = [
31983190
"log",
31993191
]
32003192

3193+
[[package]]
3194+
name = "primeorder"
3195+
version = "0.13.0"
3196+
source = "registry+https://github.com/rust-lang/crates.io-index"
3197+
checksum = "7613fdcc0831c10060fa69833ea8fa2caa94b6456f51e25356a885b530a2e3d0"
3198+
dependencies = [
3199+
"elliptic-curve",
3200+
]
3201+
32013202
[[package]]
32023203
name = "proc-macro-error"
32033204
version = "1.0.4"
@@ -3460,13 +3461,12 @@ dependencies = [
34603461

34613462
[[package]]
34623463
name = "rfc6979"
3463-
version = "0.3.1"
3464+
version = "0.4.0"
34643465
source = "registry+https://github.com/rust-lang/crates.io-index"
3465-
checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb"
3466+
checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
34663467
dependencies = [
3467-
"crypto-bigint",
34683468
"hmac",
3469-
"zeroize",
3469+
"subtle",
34703470
]
34713471

34723472
[[package]]
@@ -4979,9 +4979,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
49794979

49804980
[[package]]
49814981
name = "sec1"
4982-
version = "0.3.0"
4982+
version = "0.7.1"
49834983
source = "registry+https://github.com/rust-lang/crates.io-index"
4984-
checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928"
4984+
checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e"
49854985
dependencies = [
49864986
"base16ct",
49874987
"der",
@@ -5134,9 +5134,9 @@ checksum = "42a568c8f2cd051a4d283bd6eb0343ac214c1b0f1ac19f93e1175b2dee38c73d"
51345134

51355135
[[package]]
51365136
name = "signature"
5137-
version = "1.6.4"
5137+
version = "2.0.0"
51385138
source = "registry+https://github.com/rust-lang/crates.io-index"
5139-
checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
5139+
checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d"
51405140
dependencies = [
51415141
"digest",
51425142
"rand_core",
@@ -5247,9 +5247,9 @@ dependencies = [
52475247

52485248
[[package]]
52495249
name = "spki"
5250-
version = "0.6.0"
5250+
version = "0.7.0"
52515251
source = "registry+https://github.com/rust-lang/crates.io-index"
5252-
checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b"
5252+
checksum = "c0445c905640145c7ea8c1993555957f65e7c46d0535b91ba501bc9bfc85522f"
52535253
dependencies = [
52545254
"base64ct",
52555255
"der",
@@ -5592,9 +5592,9 @@ dependencies = [
55925592

55935593
[[package]]
55945594
name = "time"
5595-
version = "0.3.17"
5595+
version = "0.3.20"
55965596
source = "registry+https://github.com/rust-lang/crates.io-index"
5597-
checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376"
5597+
checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
55985598
dependencies = [
55995599
"itoa",
56005600
"serde",
@@ -5610,9 +5610,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
56105610

56115611
[[package]]
56125612
name = "time-macros"
5613-
version = "0.2.6"
5613+
version = "0.2.8"
56145614
source = "registry+https://github.com/rust-lang/crates.io-index"
5615-
checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2"
5615+
checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
56165616
dependencies = [
56175617
"time-core",
56185618
]
@@ -5686,15 +5686,15 @@ dependencies = [
56865686

56875687
[[package]]
56885688
name = "toml_edit"
5689-
version = "0.19.3"
5689+
version = "0.19.4"
56905690
source = "registry+https://github.com/rust-lang/crates.io-index"
5691-
checksum = "5e6a7712b49e1775fb9a7b998de6635b299237f48b404dde71704f2e0e7f37e5"
5691+
checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825"
56925692
dependencies = [
56935693
"indexmap",
5694-
"nom8",
56955694
"serde",
56965695
"serde_spanned",
56975696
"toml_datetime",
5697+
"winnow",
56985698
]
56995699

57005700
[[package]]
@@ -6309,6 +6309,15 @@ version = "0.42.1"
63096309
source = "registry+https://github.com/rust-lang/crates.io-index"
63106310
checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"
63116311

6312+
[[package]]
6313+
name = "winnow"
6314+
version = "0.3.4"
6315+
source = "registry+https://github.com/rust-lang/crates.io-index"
6316+
checksum = "c95fb4ff192527911dd18eb138ac30908e7165b8944e528b6af93aa4c842d345"
6317+
dependencies = [
6318+
"memchr",
6319+
]
6320+
63126321
[[package]]
63136322
name = "writeable"
63146323
version = "0.5.1"

compiler/rustc_ast_lowering/src/lib.rs

+7-8
Original file line numberDiff line numberDiff line change
@@ -1440,16 +1440,15 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
14401440
/// }
14411441
/// ```
14421442
///
1443-
/// we will create a TAIT definition in the HIR like
1443+
/// we will create a TAIT definition in the HIR like and return a type like `TestReturn<'a, T>`,
1444+
/// so that the function looks like:
14441445
///
1445-
/// ```ignore (type alias is not used)
1446-
/// type TestReturn<'a, T, 'x> = impl Debug + 'x
1447-
/// ```
1448-
///
1449-
/// and return a type like `TestReturn<'static, T, 'a>`, so that the function looks like:
1446+
/// ```rust
1447+
/// #![feature(type_alias_impl_trait)]
1448+
/// use std::fmt::Debug;
1449+
/// type TestReturn<'x, 'a, T: Debug + 'a> = impl Debug + 'a;
1450+
/// fn test<'x, 'a, T: Debug>(x: &'a T) -> TestReturn<'x, 'a, T> { x }
14501451
///
1451-
/// ```ignore (cannot compile TAIT example with 'static lifetime)
1452-
/// fn test<'a, T: Debug>(x: &'a T) -> TestReturn<'static, T, 'a>
14531452
/// ```
14541453
///
14551454
/// Note the subtlety around type parameters! The new TAIT, `TestReturn`, inherits all the

0 commit comments

Comments
 (0)