Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 9 pull requests #82983

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 24 commits into from
Closed

Rollup of 9 pull requests #82983

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5fe84c8
always eagerly eval consts in Relate
lcnr Jan 23, 2021
2beea2c
add test for lazy norm err
lcnr Jan 23, 2021
1ab9fe5
Add {core,std}::prelude::{rust_2015,rust_2018,rust_2021}.
m-ou-se Feb 17, 2021
d3b564c
Pick the injected prelude based on the edition.
m-ou-se Feb 17, 2021
218cf30
Update test output for edition preludes.
m-ou-se Feb 17, 2021
d274d87
Update test/pretty output for edition preludes.
m-ou-se Feb 17, 2021
76fd8d7
Use intra-doc links.
m-ou-se Feb 25, 2021
28135b7
Remove redundant enableSearchInput function
notriddle Mar 5, 2021
d854789
Do not attempt to unlock envlock in child process after a fork.
the8472 Mar 9, 2021
e40b3d6
Treat header as first paragraph for shortened markdown descriptions
notriddle Mar 10, 2021
37543ce
fix: wrong word
ltoddy Mar 10, 2021
b7d91b0
Remove `masked_crates` from `clean::Crate`
camelid Mar 10, 2021
66b6504
Simplify some of the rendering code in the index
notriddle Mar 10, 2021
55c88f5
fix error message for copy(_nonoverlapping) overflow
RalfJung Mar 10, 2021
b0514a6
Rename Option::get_or_insert_default
camsteffen Mar 10, 2021
4ff62b3
Rollup merge of #81309 - lcnr:lazy-norm-err-msgh, r=nikomatsakis
jonas-schievink Mar 10, 2021
71444a4
Rollup merge of #82217 - m-ou-se:edition-prelude, r=nikomatsakis
jonas-schievink Mar 10, 2021
7da6185
Rollup merge of #82807 - notriddle:cleanup-js, r=jyn514
jonas-schievink Mar 10, 2021
d6ad430
Rollup merge of #82949 - the8472:forget-envlock-on-fork, r=joshtriplett
jonas-schievink Mar 10, 2021
1d3076b
Rollup merge of #82955 - ltoddy:fix/wrong, r=jonas-schievink
jonas-schievink Mar 10, 2021
d103f4f
Rollup merge of #82960 - camelid:masked_crates, r=jyn514
jonas-schievink Mar 10, 2021
b7ca86a
Rollup merge of #82962 - notriddle:cleanup-index, r=jyn514
jonas-schievink Mar 10, 2021
bc6bc42
Rollup merge of #82976 - RalfJung:copy-nonoverlapping, r=oli-obk
jonas-schievink Mar 10, 2021
ea66bfc
Rollup merge of #82977 - camsteffen:opt-get-insert-def, r=m-ou-se
jonas-schievink Mar 10, 2021
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
fix: wrong word
  • Loading branch information
@ltoddy
ltoddy committed Mar 10, 2021
commit 37543ce656183c3548fa7d4c7d4f9897e73f54c9
2 changes: 1 addition & 1 deletion compiler/rustc_span/src/edition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub enum Edition {
Edition2015,
/// The 2018 edition
Edition2018,
/// The 2021 ediiton
/// The 2021 edition
Edition2021,
}

Expand Down