Skip to content

Rollup of 22 pull requests #59364

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

Closed
wants to merge 81 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
7e1914f
hir: replace NodeId with HirId in trait_impls
ljedrz Mar 10, 2019
401329e
HirIdification: remove all NodeIds from borrowck
ljedrz Mar 10, 2019
aa53741
HirIdification: remove all NodeIds from typeck
ljedrz Mar 10, 2019
9151eab
HirIdification: remove all NodeIds from rustc_mir
ljedrz Mar 10, 2019
584d61a
hir: remove trait_auto_impl
ljedrz Mar 10, 2019
18229bb
syntax: Better recovery for `$ty::AssocItem` and `ty!()::AssocItem`
petrochenkov Mar 9, 2019
79c3651
syntax: Optimize `maybe_whole`/`maybe_whole_expr` slightly
petrochenkov Mar 10, 2019
1ab8ca3
Address review comments
petrochenkov Mar 12, 2019
856b081
middle: replace NodeId with HirId in AccessLevels
ljedrz Mar 11, 2019
ff5e31f
Fix a broken link to the rustc-guide
varkor Mar 14, 2019
6e449da
Remove trailing newlines
varkor Mar 14, 2019
205ab0c
Add a link to the Discord and Zulip servers
varkor Mar 14, 2019
6f3fda9
Add links to @rust-highfive and @bors
varkor Mar 14, 2019
eadb844
Update r+ syntax
varkor Mar 14, 2019
308a002
Make all references to @bors or users links
varkor Mar 14, 2019
3a00649
Move rollup description earlier
varkor Mar 14, 2019
037596c
Fix capitalisation problem
varkor Mar 14, 2019
b392c5e
use the identifier span for missing struct field
euclio Mar 16, 2019
498bead
Tweak spans for E0599
estebank Mar 10, 2019
713f96d
Swap const evaluation lint spans to point at problem in primary span
estebank Mar 11, 2019
690bc57
Swap primary/secondary spans for E0458
estebank Mar 11, 2019
18d727f
Tweak unsupported negative trait bounds message
estebank Mar 11, 2019
bb15af1
Tweak unnecessary import suggestion
estebank Mar 11, 2019
b616cca
Hide obvious suggestion from cli output
estebank Mar 11, 2019
743d019
Deduplicate const eval error spans for better output
estebank Mar 11, 2019
b53ca90
Mark duplicate import removal suggestion tool only
estebank Mar 11, 2019
d1656f1
Fix rebase
estebank Mar 17, 2019
6007e6f
Do not complain about non-existing fields after parse recovery
estebank Mar 18, 2019
bb832c2
some small HIR doc improvements
llogiq Mar 18, 2019
ec6f983
Rename typarams to param_names
varkor Mar 13, 2019
c915fe0
Rename external_typarams to external_param_names
varkor Mar 13, 2019
1491315
Implement `Clean` for const generics
varkor Mar 13, 2019
29ed491
Add `GenericArg`
varkor Mar 13, 2019
cd9a2c0
Refactor `GenericArgs` to include const generics
varkor Mar 13, 2019
38d98a1
Implement const generics in `generics_to_path_params`
varkor Mar 13, 2019
9925d9b
Fix indentation issue
varkor Mar 14, 2019
b39e664
Make clean::Constant display respect f.alternate()
varkor Mar 18, 2019
f93ad41
Rename first_ty_sty to ty_sty
varkor Mar 18, 2019
9bc5811
Rebase over LazyConst changes
varkor Mar 18, 2019
37789c4
Update src/librustc/hir/mod.rs
Centril Mar 19, 2019
8cf720b
Make Option<ThreadId> no larger than ThreadId, with NonZeroU64
SimonSapin Mar 19, 2019
a291d4e
convert field/method confusion help to suggestions
euclio Mar 19, 2019
757eb67
review comments
estebank Mar 19, 2019
46a8beb
Move some bench tests back from libtest
gnzlbg Mar 20, 2019
b6e5d73
Add messages for different verbosity levels.
o01eg Mar 20, 2019
c1d9191
Add a test for size_of Option<ThreadId>
SimonSapin Mar 20, 2019
a8120d6
Tweak incorrect escaped char diagnostic
estebank Mar 20, 2019
2f8d9a2
Add NAN test to docs
Xaeroxe Mar 20, 2019
e2b5a03
Fix formatting and add unit tests for panic cases
Xaeroxe Mar 20, 2019
295cc77
cleanup: Remove compile-fail-fulldeps directory again
petrochenkov Mar 20, 2019
72f5d91
Fix f64 test
Xaeroxe Mar 20, 2019
830c98d
Fix undefined behavior in hint::spin_loop for x86 targets without SSE2
gnzlbg Mar 16, 2019
16a8abe
use suggestions for "enum instead of variant" error
euclio Mar 20, 2019
de021e3
FreeBSD 10.x is EOL, in FreeBSD 11 and later, ss_sp is actually a voi…
Jan 21, 2019
6b766ba
Update cargo
Mar 21, 2019
6389478
Move one test from run-make-fulldeps to ui
petrochenkov Mar 21, 2019
c97d3d4
Add tracking issue number for `seek_convenience`
LukasKalbertodt Mar 22, 2019
48af718
Expand `impl FromIterator for Option` doc to include example of early…
pnkfelix Mar 20, 2019
d5a61c0
Expand `impl FromIterator for Result` doc to include examples of `Err…
pnkfelix Mar 20, 2019
9c53011
Rollup merge of #57810 - MikaelUrankar:stack_t_bsd, r=nagisa
Mark-Simulacrum Mar 22, 2019
1f2ba0d
Rollup merge of #59058 - petrochenkov:assocrecov3, r=estebank
Mark-Simulacrum Mar 22, 2019
b76fa33
Rollup merge of #59068 - ljedrz:kill_off_NodeId_stragglers, r=Zoxc
Mark-Simulacrum Mar 22, 2019
ae89abd
Rollup merge of #59084 - estebank:diagnostic-spans, r=davidtwco
Mark-Simulacrum Mar 22, 2019
dbe70a3
Rollup merge of #59096 - ljedrz:HirIdify_AccessLevel, r=Zoxc
Mark-Simulacrum Mar 22, 2019
69a69bc
Rollup merge of #59170 - varkor:const-generics-rustdoc, r=QuietMisdre…
Mark-Simulacrum Mar 22, 2019
c9f6316
Rollup merge of #59172 - varkor:contributing-contributions, r=stevekl…
Mark-Simulacrum Mar 22, 2019
8f170fe
Rollup merge of #59239 - gnzlbg:fix_spin_loop, r=nagisa
Mark-Simulacrum Mar 22, 2019
20211eb
Rollup merge of #59240 - euclio:struct-field-span, r=oli-obk
Mark-Simulacrum Mar 22, 2019
4103238
Rollup merge of #59266 - estebank:struct-parse-recovery, r=petrochenkov
Mark-Simulacrum Mar 22, 2019
bd6a70d
Rollup merge of #59273 - llogiq:hir-docs, r=matthewjasper
Mark-Simulacrum Mar 22, 2019
2a5c042
Rollup merge of #59291 - SimonSapin:nonzero-thread-id, r=alexcrichton
Mark-Simulacrum Mar 22, 2019
fc1a533
Rollup merge of #59297 - euclio:field-method-suggestions, r=estebank
Mark-Simulacrum Mar 22, 2019
3da4970
Rollup merge of #59304 - gnzlbg:bench_tests, r=alexcrichton
Mark-Simulacrum Mar 22, 2019
e90bf70
Rollup merge of #59309 - o01eg:verbose-copy-files, r=alexcrichton
Mark-Simulacrum Mar 22, 2019
0d456f4
Rollup merge of #59322 - estebank:diag-tweak, r=davidtwco
Mark-Simulacrum Mar 22, 2019
5fa6896
Rollup merge of #59323 - euclio:enum-instead-of-variant, r=varkor
Mark-Simulacrum Mar 22, 2019
ff929e5
Rollup merge of #59327 - Xaeroxe:clamp-doc, r=scottmcm
Mark-Simulacrum Mar 22, 2019
ad30404
Rollup merge of #59329 - petrochenkov:rmcff, r=alexcrichton
Mark-Simulacrum Mar 22, 2019
b5424a0
Rollup merge of #59347 - petrochenkov:nomake, r=davidtwco
Mark-Simulacrum Mar 22, 2019
ab4c5b3
Rollup merge of #59360 - LukasKalbertodt:patch-2, r=rkruppe
Mark-Simulacrum Mar 22, 2019
f90f0b3
Rollup merge of #59362 - pnkfelix:demo-from-iterator-short-circuiting…
Mark-Simulacrum Mar 22, 2019
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
Hide obvious suggestion from cli output
  • Loading branch information
estebank committed Mar 17, 2019
commit b616ccae5ff718d71c242d3ac9c50ccae07c855f
2 changes: 1 addition & 1 deletion src/librustc_resolve/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5112,7 +5112,7 @@ impl<'a> Resolver<'a> {
// extra for the comma.
span.lo().0 - (prev_comma.as_bytes().len() as u32) - 1
));
err.span_suggestion(
err.tool_only_span_suggestion(
span, message, String::new(), Applicability::MaybeIncorrect,
);
return;
Expand Down
6 changes: 2 additions & 4 deletions src/test/ui/error-codes/E0430.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ error[E0252]: the name `fmt` is defined multiple times
--> $DIR/E0430.rs:1:22
|
LL | use std::fmt::{self, self};
| ------^^^^
| | | |
| | | `fmt` reimported here
| | help: remove unnecessary import
| ---- ^^^^ `fmt` reimported here
| |
| previous import of the module `fmt` here
|
= note: `fmt` must be defined only once in the type namespace of this module
Expand Down
6 changes: 2 additions & 4 deletions src/test/ui/issues/issue-45829/import-twice.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ error[E0252]: the name `A` is defined multiple times
--> $DIR/import-twice.rs:6:14
|
LL | use foo::{A, A};
| ---^
| || |
| || `A` reimported here
| |help: remove unnecessary import
| - ^ `A` reimported here
| |
| previous import of the type `A` here
|
= note: `A` must be defined only once in the type namespace of this module
Expand Down
18 changes: 5 additions & 13 deletions src/test/ui/issues/issue-52891.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@ LL | use issue_52891::a;
| -------------- previous import of the module `a` here
...
LL | use issue_52891::{f, g, a};
| --^
| | |
| | `a` reimported here
| help: remove unnecessary import
| ^ `a` reimported here
|
= note: `a` must be defined only once in the type namespace of this module

Expand Down Expand Up @@ -82,16 +79,11 @@ LL | a,
error[E0252]: the name `a` is defined multiple times
--> $DIR/issue-52891.rs:26:5
|
LL | use issue_52891::a;
| -------------- previous import of the module `a` here
LL | use issue_52891::a;
| -------------- previous import of the module `a` here
...
LL | m,
| ______-
LL | | a};
| | ^
| | |
| |_____`a` reimported here
| help: remove unnecessary import
LL | a};
| ^ `a` reimported here
|
= note: `a` must be defined only once in the type namespace of this module

Expand Down