Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 8 pull requests #102450

Merged
merged 24 commits into from
Sep 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
c846a2a
Make `std::os::fd` public.
sunfishcode Jun 14, 2022
09bbc42
Update asrawfd.js.
sunfishcode Jun 22, 2022
bda1262
Clarify that the `fd` module is supported on Unix and WASI.
sunfishcode Jun 30, 2022
7d80510
Re-introduce `unstable` attributes.
sunfishcode Aug 23, 2022
a7f3ba9
Fix compilation of the doc tests on Windows.
sunfishcode Sep 2, 2022
f9ef7e2
code refactoring smart_resolve_report_errors
chenyukang Sep 20, 2022
7adfb44
add trivial comments
chenyukang Sep 21, 2022
fdda7e0
more code refactor on smart_resolve_report_errors
chenyukang Sep 25, 2022
db0877f
trivial fix on fallback
chenyukang Sep 25, 2022
356a52c
add regression test
Rageking8 Sep 28, 2022
4fdc78e
account for use of index-based lifetime names in print of binder
b-naber Sep 28, 2022
a670897
add test
b-naber Sep 28, 2022
9ccb851
update fixme
lcnr Sep 28, 2022
2ee2ffa
improve E0585 help
Rageking8 Sep 27, 2022
a913277
Add a niche to `Duration`, unix `SystemTime`, and non-apple `Instant`
beetrees Sep 14, 2022
5baceaf
env::temp_dir: fix a typo
RalfJung Sep 28, 2022
7cd4780
Rollup merge of #98368 - sunfishcode:sunfishcode/std-os-fd, r=joshtri…
JohnTitor Sep 29, 2022
852a152
Rollup merge of #102085 - chenyukang:code-refactor, r=cjgillot
JohnTitor Sep 29, 2022
19e84b9
Rollup merge of #102351 - Rageking8:improve-E0585, r=wesleywiser
JohnTitor Sep 29, 2022
8e4869e
Rollup merge of #102368 - beetrees:nano-niche, r=joshtriplett
JohnTitor Sep 29, 2022
cf158a4
Rollup merge of #102393 - Rageking8:add-regression-test-for-issue-949…
JohnTitor Sep 29, 2022
039e9e2
Rollup merge of #102399 - b-naber:binder-print-ice, r=lcnr
JohnTitor Sep 29, 2022
80e009c
Rollup merge of #102416 - lcnr:specialization-fixme, r=compiler-errors
JohnTitor Sep 29, 2022
5c731cd
Rollup merge of #102433 - RalfJung:temp-dir-typo, r=thomcc
JohnTitor Sep 29, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/rustc_error_messages/locales/en-US/parser.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ parser_assignment_else_not_allowed = <assignment> ... else {"{"} ... {"}"} is no
parser_expected_statement_after_outer_attr = expected statement after outer attribute

parser_doc_comment_does_not_document_anything = found a documentation comment that doesn't document anything
.help = doc comments must come before what they document, maybe a comment was intended with `//`?
.help = doc comments must come before what they document, if a comment was intended use `//`
.suggestion = missing comma here

parser_const_let_mutually_exclusive = `const` and `let` are mutually exclusive
Expand Down
14 changes: 10 additions & 4 deletions compiler/rustc_middle/src/ty/print/pretty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2173,10 +2173,16 @@ impl<'tcx> FmtPrinter<'_, 'tcx> {

let mut region_index = self.region_index;
let mut next_name = |this: &Self| {
let name = name_by_region_index(region_index, &mut available_names, num_available);
debug!(?name);
region_index += 1;
assert!(!this.used_region_names.contains(&name));
let mut name;

loop {
name = name_by_region_index(region_index, &mut available_names, num_available);
region_index += 1;

if !this.used_region_names.contains(&name) {
break;
}
}

name
};
Expand Down
4 changes: 2 additions & 2 deletions compiler/rustc_parse/src/parser/item.rs
Original file line number Diff line number Diff line change
Expand Up @@ -760,8 +760,8 @@ impl<'a> Parser<'a> {
)
.span_label(self.token.span, "this doc comment doesn't document anything")
.help(
"doc comments must come before what they document, maybe a \
comment was intended with `//`?",
"doc comments must come before what they document, if a comment was \
intended use `//`",
)
.emit();
self.bump();
Expand Down
Loading