Skip to content

Commit 755064b

Browse files
borsbors
committed
Auto merge of rust-lang#76852 - Mark-Simulacrum:beta-next, r=Mark-Simulacrum
[beta] backports * Ignore rustc_private items from std docs rust-lang#76571 * Fix HashMap visualizers in Visual Studio (Code) rust-lang#76389 * Account for version number in NtIdent hack rust-lang#76331 * Account for async functions when suggesting new named lifetime rust-lang#75867 * Fix loading pretty-printers in rust-lldb script rust-lang#76015 This also bumps to the released stable compiler.
2 parents aa30bf3 + 557e2bc commit 755064b

File tree

18 files changed

+170
-37
lines changed

18 files changed

+170
-37
lines changed

‎src/bootstrap/dist.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,6 +647,7 @@ impl Step for DebuggerScripts {
647647

648648
cp_debugger_script("lldb_lookup.py");
649649
cp_debugger_script("lldb_providers.py");
650+
cp_debugger_script("lldb_commands")
650651
}
651652
}
652653
}

‎src/etc/lldb_commands

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_lookup.py\"
21
type synthetic add -l lldb_lookup.synthetic_lookup -x \".*\" --category Rust
32
type summary add -F lldb_lookup.summary_lookup -e -x -h \"^(alloc::([a-z_]+::)+)String$\" --category Rust
43
type summary add -F lldb_lookup.summary_lookup -e -x -h \"^&str$\" --category Rust

‎src/etc/natvis/libstd.natvis

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<If Condition="(base.table.ctrl.pointer[i] &amp; 0x80) == 0">
4242
<!-- Bucket is populated -->
4343
<Exec>n--</Exec>
44-
<Item Name="{static_cast&lt;tuple&lt;$T1, $T2&gt;*&gt;(base.table.ctrl.pointer)[-(i + 1)].__0}">static_cast&lt;tuple&lt;$T1, $T2&gt;*&gt;(base.table.ctrl.pointer)[-(i + 1)].__1</Item>
44+
<Item Name="{((tuple&lt;$T1, $T2&gt;*)base.table.ctrl.pointer)[-(i + 1)].__0}">((tuple&lt;$T1, $T2&gt;*)base.table.ctrl.pointer)[-(i + 1)].__1</Item>
4545
</If>
4646
<Exec>i++</Exec>
4747
</Loop>
@@ -65,7 +65,7 @@
6565
<If Condition="(map.base.table.ctrl.pointer[i] &amp; 0x80) == 0">
6666
<!-- Bucket is populated -->
6767
<Exec>n--</Exec>
68-
<Item>static_cast&lt;$T1*&gt;(map.base.table.ctrl.pointer)[-(i + 1)]</Item>
68+
<Item>(($T1*)map.base.table.ctrl.pointer)[-(i + 1)]</Item>
6969
</If>
7070
<Exec>i++</Exec>
7171
</Loop>

‎src/etc/rust-lldb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,5 +30,8 @@ EOF
3030
fi
3131
fi
3232

33+
script_import="command script import \"$RUSTC_SYSROOT/lib/rustlib/etc/lldb_lookup.py\""
34+
commands_file="$RUSTC_SYSROOT/lib/rustlib/etc/lldb_commands"
35+
3336
# Call LLDB with the commands added to the argument list
34-
exec "$lldb" --source-before-file ./lldb_commands "$@"
37+
exec "$lldb" --one-line-before-file "$script_import" --source-before-file "$commands_file" "$@"

‎src/librustc_ast/token.rs

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -821,9 +821,19 @@ impl Nonterminal {
821821
if let ExpnKind::Macro(_, macro_name) = orig_span.ctxt().outer_expn_data().kind {
822822
let filename = source_map.span_to_filename(orig_span);
823823
if let FileName::Real(RealFileName::Named(path)) = filename {
824-
if (path.ends_with("time-macros-impl/src/lib.rs")
825-
&& macro_name == sym::impl_macros)
826-
|| (path.ends_with("js-sys/src/lib.rs") && macro_name == sym::arrays)
824+
let matches_prefix = |prefix| {
825+
// Check for a path that ends with 'prefix*/src/lib.rs'
826+
let mut iter = path.components().rev();
827+
iter.next().and_then(|p| p.as_os_str().to_str()) == Some("lib.rs")
828+
&& iter.next().and_then(|p| p.as_os_str().to_str()) == Some("src")
829+
&& iter
830+
.next()
831+
.and_then(|p| p.as_os_str().to_str())
832+
.map_or(false, |p| p.starts_with(prefix))
833+
};
834+
835+
if (macro_name == sym::impl_macros && matches_prefix("time-macros-impl"))
836+
|| (macro_name == sym::arrays && matches_prefix("js-sys"))
827837
{
828838
let snippet = source_map.span_to_snippet(orig_span);
829839
if snippet.as_deref() == Ok("$name") {

‎src/librustc_resolve/late/diagnostics.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1222,6 +1222,9 @@ impl<'tcx> LifetimeContext<'_, 'tcx> {
12221222
synthetic: Some(hir::SyntheticTyParamKind::ImplTrait),
12231223
..
12241224
} => false,
1225+
hir::GenericParamKind::Lifetime {
1226+
kind: hir::LifetimeParamKind::Elided,
1227+
} => false,
12251228
_ => true,
12261229
}) {
12271230
(param.span.shrink_to_lo(), format!("{}, ", lifetime_ref))

‎src/librustdoc/clean/inline.rs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -337,18 +337,13 @@ pub fn build_impl(
337337
// reachable in rustdoc generated documentation
338338
if !did.is_local() {
339339
if let Some(traitref) = associated_trait {
340-
if !cx.renderinfo.borrow().access_levels.is_public(traitref.def_id) {
340+
let did = traitref.def_id;
341+
if !cx.renderinfo.borrow().access_levels.is_public(did) {
341342
return;
342343
}
343-
}
344344

345-
// Skip foreign unstable traits from lists of trait implementations and
346-
// such. This helps prevent dependencies of the standard library, for
347-
// example, from getting documented as "traits `u32` implements" which
348-
// isn't really too helpful.
349-
if let Some(trait_did) = associated_trait {
350-
if let Some(stab) = cx.tcx.lookup_stability(trait_did.def_id) {
351-
if stab.level.is_unstable() {
345+
if let Some(stab) = tcx.lookup_stability(did) {
346+
if stab.level.is_unstable() && stab.feature == sym::rustc_private {
352347
return;
353348
}
354349
}
@@ -372,6 +367,12 @@ pub fn build_impl(
372367
if !cx.renderinfo.borrow().access_levels.is_public(did) {
373368
return;
374369
}
370+
371+
if let Some(stab) = tcx.lookup_stability(did) {
372+
if stab.level.is_unstable() && stab.feature == sym::rustc_private {
373+
return;
374+
}
375+
}
375376
}
376377
}
377378

‎src/stage0.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# source tarball for a stable release you'll likely see `1.x.0` for rustc and
1313
# `0.(x+1).0` for Cargo where they were released on `date`.
1414

15-
date: 2020-08-24
15+
date: 2020-08-27
1616
rustc: 1.46.0
1717
cargo: 0.47.0
1818

@@ -40,4 +40,4 @@ cargo: 0.47.0
4040
# looking at a beta source tarball and it's uncommented we'll shortly comment it
4141
# out.
4242

43-
dev: 1
43+
#dev: 1

‎src/test/rustdoc/auxiliary/real_gimli.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// aux-build:realcore.rs
2+
3+
#![crate_name = "real_gimli"]
4+
#![feature(staged_api, extremely_unstable)]
5+
#![unstable(feature = "rustc_private", issue = "none")]
6+
7+
extern crate realcore;
8+
9+
#[unstable(feature = "rustc_private", issue = "none")]
10+
pub struct EndianSlice;
11+
12+
#[unstable(feature = "rustc_private", issue = "none")]
13+
impl realcore::Deref for EndianSlice {}

‎src/test/rustdoc/auxiliary/realcore.rs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#![crate_name = "realcore"]
2+
#![feature(staged_api)]
3+
#![unstable(feature = "extremely_unstable", issue = "none")]
4+
5+
#[unstable(feature = "extremely_unstable_foo", issue = "none")]
6+
pub struct Foo {}
7+
8+
#[unstable(feature = "extremely_unstable_foo", issue = "none")]
9+
pub trait Join {}
10+
11+
#[unstable(feature = "extremely_unstable_foo", issue = "none")]
12+
impl Join for Foo {}
13+
14+
#[stable(feature = "faked_deref", since = "1.47.0")]
15+
pub trait Deref {}

‎src/test/rustdoc/issue-75588.rs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// ignore-tidy-linelength
2+
// aux-build:realcore.rs
3+
// aux-build:real_gimli.rs
4+
5+
// Ensure unstably exported traits have their Implementors sections.
6+
7+
#![crate_name = "foo"]
8+
#![feature(extremely_unstable_foo)]
9+
10+
extern crate realcore;
11+
extern crate real_gimli;
12+
13+
// issue #74672
14+
// @!has foo/trait.Deref.html '//*[@id="impl-Deref-for-EndianSlice"]//code' 'impl Deref for EndianSlice'
15+
pub use realcore::Deref;
16+
17+
// @has foo/trait.Join.html '//*[@id="impl-Join-for-Foo"]//code' 'impl Join for Foo'
18+
pub use realcore::Join;

‎src/test/ui/proc-macro/group-compat-hack/group-compat-hack.rs

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,37 @@ extern crate std;
1313
// place of a `None`-delimited group. This allows us to maintain
1414
// backwards compatibility for older versions of these crates.
1515

16-
include!("js-sys/src/lib.rs");
17-
include!("time-macros-impl/src/lib.rs");
16+
mod no_version {
17+
include!("js-sys/src/lib.rs");
18+
include!("time-macros-impl/src/lib.rs");
1819

19-
macro_rules! other {
20-
($name:ident) => {
21-
#[my_macro] struct Three($name);
20+
macro_rules! other {
21+
($name:ident) => {
22+
#[my_macro] struct Three($name);
23+
}
2224
}
25+
26+
struct Foo;
27+
impl_macros!(Foo);
28+
arrays!(Foo);
29+
other!(Foo);
2330
}
2431

25-
fn main() {
32+
mod with_version {
33+
include!("js-sys-0.3.17/src/lib.rs");
34+
include!("time-macros-impl-0.1.0/src/lib.rs");
35+
36+
macro_rules! other {
37+
($name:ident) => {
38+
#[my_macro] struct Three($name);
39+
}
40+
}
41+
2642
struct Foo;
2743
impl_macros!(Foo);
2844
arrays!(Foo);
2945
other!(Foo);
3046
}
47+
48+
49+
fn main() {}

‎src/test/ui/proc-macro/group-compat-hack/group-compat-hack.stdout

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/time-macros-impl/src/lib.rs:5:21: 5:27 (#5) }, Ident { ident: "One", span: $DIR/time-macros-impl/src/lib.rs:5:28: 5:31 (#5) }, Group { delimiter: Parenthesis, stream: TokenStream [Ident { ident: "Foo", span: $DIR/group-compat-hack.rs:27:18: 27:21 (#0) }], span: $DIR/time-macros-impl/src/lib.rs:5:31: 5:38 (#5) }, Punct { ch: ';', spacing: Alone, span: $DIR/time-macros-impl/src/lib.rs:5:38: 5:39 (#5) }]
22
Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/js-sys/src/lib.rs:5:21: 5:27 (#9) }, Ident { ident: "Two", span: $DIR/js-sys/src/lib.rs:5:28: 5:31 (#9) }, Group { delimiter: Parenthesis, stream: TokenStream [Ident { ident: "Foo", span: $DIR/group-compat-hack.rs:28:13: 28:16 (#0) }], span: $DIR/js-sys/src/lib.rs:5:31: 5:38 (#9) }, Punct { ch: ';', spacing: Alone, span: $DIR/js-sys/src/lib.rs:5:38: 5:39 (#9) }]
3-
Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/group-compat-hack.rs:21:21: 21:27 (#13) }, Ident { ident: "Three", span: $DIR/group-compat-hack.rs:21:28: 21:33 (#13) }, Group { delimiter: Parenthesis, stream: TokenStream [Group { delimiter: None, stream: TokenStream [Ident { ident: "Foo", span: $DIR/group-compat-hack.rs:29:12: 29:15 (#0) }], span: $DIR/group-compat-hack.rs:21:34: 21:39 (#13) }], span: $DIR/group-compat-hack.rs:21:33: 21:40 (#13) }, Punct { ch: ';', spacing: Alone, span: $DIR/group-compat-hack.rs:21:40: 21:41 (#13) }]
3+
Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/group-compat-hack.rs:22:25: 22:31 (#13) }, Ident { ident: "Three", span: $DIR/group-compat-hack.rs:22:32: 22:37 (#13) }, Group { delimiter: Parenthesis, stream: TokenStream [Group { delimiter: None, stream: TokenStream [Ident { ident: "Foo", span: $DIR/group-compat-hack.rs:29:12: 29:15 (#0) }], span: $DIR/group-compat-hack.rs:22:38: 22:43 (#13) }], span: $DIR/group-compat-hack.rs:22:37: 22:44 (#13) }, Punct { ch: ';', spacing: Alone, span: $DIR/group-compat-hack.rs:22:44: 22:45 (#13) }]
4+
Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/time-macros-impl-0.1.0/src/lib.rs:5:21: 5:27 (#19) }, Ident { ident: "One", span: $DIR/time-macros-impl-0.1.0/src/lib.rs:5:28: 5:31 (#19) }, Group { delimiter: Parenthesis, stream: TokenStream [Ident { ident: "Foo", span: $DIR/group-compat-hack.rs:43:18: 43:21 (#0) }], span: $DIR/time-macros-impl-0.1.0/src/lib.rs:5:31: 5:38 (#19) }, Punct { ch: ';', spacing: Alone, span: $DIR/time-macros-impl-0.1.0/src/lib.rs:5:38: 5:39 (#19) }]
5+
Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/js-sys-0.3.17/src/lib.rs:5:21: 5:27 (#23) }, Ident { ident: "Two", span: $DIR/js-sys-0.3.17/src/lib.rs:5:28: 5:31 (#23) }, Group { delimiter: Parenthesis, stream: TokenStream [Ident { ident: "Foo", span: $DIR/group-compat-hack.rs:44:13: 44:16 (#0) }], span: $DIR/js-sys-0.3.17/src/lib.rs:5:31: 5:38 (#23) }, Punct { ch: ';', spacing: Alone, span: $DIR/js-sys-0.3.17/src/lib.rs:5:38: 5:39 (#23) }]
6+
Called proc_macro_hack with TokenStream [Ident { ident: "struct", span: $DIR/group-compat-hack.rs:38:25: 38:31 (#27) }, Ident { ident: "Three", span: $DIR/group-compat-hack.rs:38:32: 38:37 (#27) }, Group { delimiter: Parenthesis, stream: TokenStream [Group { delimiter: None, stream: TokenStream [Ident { ident: "Foo", span: $DIR/group-compat-hack.rs:45:12: 45:15 (#0) }], span: $DIR/group-compat-hack.rs:38:38: 38:43 (#27) }], span: $DIR/group-compat-hack.rs:38:37: 38:44 (#27) }, Punct { ch: ';', spacing: Alone, span: $DIR/group-compat-hack.rs:38:44: 38:45 (#27) }]

‎src/test/ui/proc-macro/group-compat-hack/js-sys-0.3.17/src/lib.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// ignore-test this is not a test
2+
3+
macro_rules! arrays {
4+
($name:ident) => {
5+
#[my_macro] struct Two($name);
6+
}
7+
}

‎src/test/ui/proc-macro/group-compat-hack/time-macros-impl-0.1.0/src/lib.rs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// ignore-test this is not a test
2+
3+
macro_rules! impl_macros {
4+
($name:ident) => {
5+
#[my_macro] struct One($name);
6+
}
7+
}

‎src/test/ui/regions/regions-name-undeclared.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
// edition:2018
12
// Check that lifetime resolver enforces the lifetime name scoping
23
// rules correctly in various scenarios.
34

@@ -47,4 +48,11 @@ fn fn_types(a: &'a isize, //~ ERROR undeclared lifetime
4748
{
4849
}
4950

51+
struct Bug {}
52+
impl Bug {
53+
async fn buggy(&self) -> &'a str { //~ ERROR use of undeclared lifetime name `'a`
54+
todo!()
55+
}
56+
}
57+
5058
pub fn main() {}

‎src/test/ui/regions/regions-name-undeclared.stderr

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0261]: use of undeclared lifetime name `'b`
2-
--> $DIR/regions-name-undeclared.rs:15:24
2+
--> $DIR/regions-name-undeclared.rs:16:24
33
|
44
LL | fn m4(&self, arg: &'b isize) { }
55
| ^^ undeclared lifetime
@@ -15,7 +15,7 @@ LL | fn m4<'b>(&self, arg: &'b isize) { }
1515
| ^^^^
1616

1717
error[E0261]: use of undeclared lifetime name `'b`
18-
--> $DIR/regions-name-undeclared.rs:16:12
18+
--> $DIR/regions-name-undeclared.rs:17:12
1919
|
2020
LL | fn m5(&'b self) { }
2121
| ^^ undeclared lifetime
@@ -31,7 +31,7 @@ LL | fn m5<'b>(&'b self) { }
3131
| ^^^^
3232

3333
error[E0261]: use of undeclared lifetime name `'b`
34-
--> $DIR/regions-name-undeclared.rs:17:27
34+
--> $DIR/regions-name-undeclared.rs:18:27
3535
|
3636
LL | fn m6(&self, arg: Foo<'b>) { }
3737
| ^^ undeclared lifetime
@@ -47,7 +47,7 @@ LL | fn m6<'b>(&self, arg: Foo<'b>) { }
4747
| ^^^^
4848

4949
error[E0261]: use of undeclared lifetime name `'a`
50-
--> $DIR/regions-name-undeclared.rs:25:22
50+
--> $DIR/regions-name-undeclared.rs:26:22
5151
|
5252
LL | type X = Option<&'a isize>;
5353
| - ^^ undeclared lifetime
@@ -57,7 +57,7 @@ LL | type X = Option<&'a isize>;
5757
= help: if you want to experiment with in-band lifetime bindings, add `#![feature(in_band_lifetimes)]` to the crate attributes
5858

5959
error[E0261]: use of undeclared lifetime name `'a`
60-
--> $DIR/regions-name-undeclared.rs:27:13
60+
--> $DIR/regions-name-undeclared.rs:28:13
6161
|
6262
LL | enum E {
6363
| - help: consider introducing lifetime `'a` here: `<'a>`
@@ -67,7 +67,7 @@ LL | E1(&'a isize)
6767
= help: if you want to experiment with in-band lifetime bindings, add `#![feature(in_band_lifetimes)]` to the crate attributes
6868

6969
error[E0261]: use of undeclared lifetime name `'a`
70-
--> $DIR/regions-name-undeclared.rs:30:13
70+
--> $DIR/regions-name-undeclared.rs:31:13
7171
|
7272
LL | struct S {
7373
| - help: consider introducing lifetime `'a` here: `<'a>`
@@ -77,7 +77,7 @@ LL | f: &'a isize
7777
= help: if you want to experiment with in-band lifetime bindings, add `#![feature(in_band_lifetimes)]` to the crate attributes
7878

7979
error[E0261]: use of undeclared lifetime name `'a`
80-
--> $DIR/regions-name-undeclared.rs:32:14
80+
--> $DIR/regions-name-undeclared.rs:33:14
8181
|
8282
LL | fn f(a: &'a isize) { }
8383
| - ^^ undeclared lifetime
@@ -87,7 +87,7 @@ LL | fn f(a: &'a isize) { }
8787
= help: if you want to experiment with in-band lifetime bindings, add `#![feature(in_band_lifetimes)]` to the crate attributes
8888

8989
error[E0261]: use of undeclared lifetime name `'a`
90-
--> $DIR/regions-name-undeclared.rs:40:17
90+
--> $DIR/regions-name-undeclared.rs:41:17
9191
|
9292
LL | fn fn_types(a: &'a isize,
9393
| - ^^ undeclared lifetime
@@ -97,7 +97,7 @@ LL | fn fn_types(a: &'a isize,
9797
= help: if you want to experiment with in-band lifetime bindings, add `#![feature(in_band_lifetimes)]` to the crate attributes
9898

9999
error[E0261]: use of undeclared lifetime name `'b`
100-
--> $DIR/regions-name-undeclared.rs:42:36
100+
--> $DIR/regions-name-undeclared.rs:43:36
101101
|
102102
LL | ... &'b isize,
103103
| ^^ undeclared lifetime
@@ -114,7 +114,7 @@ LL | b: Box<dyn for<'a, 'b> FnOnce(&'a isize,
114114
| ^^^^
115115

116116
error[E0261]: use of undeclared lifetime name `'b`
117-
--> $DIR/regions-name-undeclared.rs:45:36
117+
--> $DIR/regions-name-undeclared.rs:46:36
118118
|
119119
LL | ... &'b isize)>,
120120
| ^^ undeclared lifetime
@@ -131,7 +131,7 @@ LL | b: Box<dyn for<'a, 'b> FnOnce(&'a isize,
131131
| ^^^^
132132

133133
error[E0261]: use of undeclared lifetime name `'a`
134-
--> $DIR/regions-name-undeclared.rs:46:17
134+
--> $DIR/regions-name-undeclared.rs:47:17
135135
|
136136
LL | fn fn_types(a: &'a isize,
137137
| - help: consider introducing lifetime `'a` here: `<'a>`
@@ -141,6 +141,22 @@ LL | c: &'a isize)
141141
|
142142
= help: if you want to experiment with in-band lifetime bindings, add `#![feature(in_band_lifetimes)]` to the crate attributes
143143

144-
error: aborting due to 11 previous errors
144+
error[E0261]: use of undeclared lifetime name `'a`
145+
--> $DIR/regions-name-undeclared.rs:53:31
146+
|
147+
LL | async fn buggy(&self) -> &'a str {
148+
| ^^ undeclared lifetime
149+
|
150+
= help: if you want to experiment with in-band lifetime bindings, add `#![feature(in_band_lifetimes)]` to the crate attributes
151+
help: consider introducing lifetime `'a` here
152+
|
153+
LL | impl<'a> Bug {
154+
| ^^^^
155+
help: consider introducing lifetime `'a` here
156+
|
157+
LL | async fn buggy<'a>(&self) -> &'a str {
158+
| ^^^^
159+
160+
error: aborting due to 12 previous errors
145161

146162
For more information about this error, try `rustc --explain E0261`.

‎src/tools/linkchecker/main.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,16 @@ fn is_exception(file: &Path, link: &str) -> bool {
141141
if let Some(entry) = LINKCHECK_EXCEPTIONS.iter().find(|&(f, _)| file.ends_with(f)) {
142142
entry.1.contains(&link)
143143
} else {
144+
// FIXME(#63351): Concat trait in alloc/slice reexported in primitive page
145+
//
146+
// NOTE: This cannot be added to `LINKCHECK_EXCEPTIONS` because the resolved path
147+
// calculated in `check` function is outside `build/<triple>/doc` dir.
148+
// So the `strip_prefix` method just returns the old absolute broken path.
149+
if file.ends_with("std/primitive.slice.html") {
150+
if link.ends_with("primitive.slice.html") {
151+
return true;
152+
}
153+
}
144154
false
145155
}
146156
}

0 commit comments

Comments
 (0)