Skip to content

Rollup of 6 pull requests #102407

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.

Sign up for GitHub

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

Closed
wants to merge 21 commits into from
Closed

Rollup of 6 pull requests #102407

Changes from 1 commit
Commits
Show all changes
21 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
cca4828
Format type_of
compiler-errors Sep 26, 2022
05267b5
Make type_of work correctly for const arg bindings
compiler-errors Sep 26, 2022
92561f4
Support bindings with anon consts in generics
compiler-errors Sep 26, 2022
7f06d51
Don't export `__heap_base` and `__data_end` on wasm32-wasi.
sunfishcode Sep 28, 2022
356a52c
add regression test
Rageking8 Sep 28, 2022
b9b969a
Add a niche to `Duration`, unix `SystemTime`, and non-apple `Instant`
beetrees Sep 14, 2022
c63c6dd
Rollup merge of #98368 - sunfishcode:sunfishcode/std-os-fd, r=joshtri…
Dylan-DPC Sep 28, 2022
03ce358
Rollup merge of #102085 - chenyukang:code-refactor, r=cjgillot
Dylan-DPC Sep 28, 2022
65c97a1
Rollup merge of #102336 - compiler-errors:issue-102333, r=jackh726
Dylan-DPC Sep 28, 2022
3b5e81b
Rollup merge of #102368 - beetrees:nano-niche, r=joshtriplett
Dylan-DPC Sep 28, 2022
3599e82
Rollup merge of #102385 - sunfishcode:sunfishcode/wasm-no-export-heap…
Dylan-DPC Sep 28, 2022
32f0db9
Rollup merge of #102393 - Rageking8:add-regression-test-for-issue-949…
Dylan-DPC Sep 28, 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
Prev Previous commit
Next Next commit
add trivial comments
  • Loading branch information
@chenyukang
chenyukang committed Sep 21, 2022
commit 7adfb44b95335ce9a565aea1f5f32a3e14119f9c
5 changes: 3 additions & 2 deletions compiler/rustc_resolve/src/late/diagnostics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ pub(super) enum LifetimeElisionCandidate {
Missing(MissingLifetime),
}

/// Only used for diagnostics.
struct BaseError<'a> {
msg: String,
fallback_label: String,
Expand Down Expand Up @@ -313,7 +314,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
}

self.suggest_type_ascription(&mut err, source, path, res, span, &base_error);
self.add_err_code_cases(&mut err, source, path, span);
self.err_code_special_cases(&mut err, source, path, span);

(err, candidates)
}
Expand Down Expand Up @@ -667,7 +668,7 @@ impl<'a: 'ast, 'ast> LateResolutionVisitor<'a, '_, 'ast> {
}
}

fn add_err_code_cases(
fn err_code_special_cases(
&mut self,
err: &mut DiagnosticBuilder<'_, ErrorGuaranteed>,
source: PathSource<'_>,
Expand Down