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 10 pull requests #82790

Closed
wants to merge 63 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
f45bdcc
Implement size_hint for BufReader
Xavientois Jan 15, 2021
c3e47d9
Fix implementation to specialize
Xavientois Jan 15, 2021
fa76db3
Use helper trait to follow min_specialization rules
Xavientois Jan 15, 2021
11c49f6
Add missing generic
Xavientois Jan 15, 2021
260a270
Move default to trait definition
Xavientois Jan 15, 2021
5f60a30
Fix incorrect token
Xavientois Jan 15, 2021
eea99f4
Add default keyword for specialization
Xavientois Jan 15, 2021
7e56637
Add back lower_bound as memeber
Xavientois Jan 16, 2021
442de9a
Fix semicolon
Xavientois Jan 16, 2021
1190321
Remove exposing private trait
Xavientois Jan 16, 2021
421b40c
Add dyn for SizeHint cast
Xavientois Jan 16, 2021
265db94
Fix formatting
Xavientois Jan 16, 2021
93870c8
Remove stable annotation
Xavientois Jan 16, 2021
7869371
Remove unnecessary default keyword
Xavientois Jan 16, 2021
c8e0f8a
Use fully qualified syntax to avoid dyn
Xavientois Jan 16, 2021
96255f8
Implement SizeHint trait for BufReader, Emtpy, and Chain
Xavientois Jan 16, 2021
389e638
Add tests for SizeHint implementations
Xavientois Jan 16, 2021
b837f3a
Remove trailing newline
Xavientois Jan 16, 2021
81aba38
Add space for proper indentation
Xavientois Jan 16, 2021
fc9cd4a
Fix formatting on mod
Xavientois Jan 16, 2021
7674ae1
Fix line length format
Xavientois Jan 31, 2021
7b021aa
resolve: Reduce scope of `pub_use_of_private_extern_crate` deprecatio…
petrochenkov Jan 28, 2021
6e52b23
Fix jemalloc usage on OSX
sfackler Feb 28, 2021
0ae7250
Add a regression test for issue-81712
JohnTitor Mar 4, 2021
0559e50
Remove a dead code path
oli-obk Mar 4, 2021
09cbcdc
Add BTreeMap::try_insert and btree_map::OccupiedError.
m-ou-se Mar 4, 2021
f6fe24a
Add HashMap::try_insert and hash_map::OccupiedError.
m-ou-se Mar 4, 2021
69d95e2
Improve Debug implementations of OccupiedError.
m-ou-se Mar 4, 2021
d85d82a
Implement Error for OccupiedError.
m-ou-se Mar 4, 2021
da01455
Ignore file length tidy warning in hash/map.rs.
m-ou-se Mar 4, 2021
63af264
Spread tracing instrumentation into the polymorphization logic
oli-obk Mar 4, 2021
67a61b9
Typo
oli-obk Mar 4, 2021
29f4aa7
Fixes -Zpolymorphize for src/test/ui/const-generics/auxiliary/crayte.rs
oli-obk Mar 4, 2021
1aedb4c
Remove unnecessary bound from HashMap::try_insert.
m-ou-se Mar 4, 2021
eddd4f0
Add tracking issue for map_try_insert.
m-ou-se Mar 4, 2021
eb18746
Add assert_matches!(expr, pat).
m-ou-se Mar 4, 2021
cfce60e
Allow for multiple patterns and a guard in assert_matches.
m-ou-se Mar 4, 2021
0a8e401
Add debug_assert_matches macro.
m-ou-se Mar 4, 2021
5bd1204
Fix assert_matches doc examples.
m-ou-se Mar 4, 2021
48167c4
Moved Context and its impls to a separate file
Nicholas-Baron Feb 14, 2021
6c7d7a6
Moved `print_item` and helpers to a separate file
Nicholas-Baron Feb 14, 2021
14983b9
Moved the `make_item_keywords` function to `context.rs` as it is only…
Nicholas-Baron Feb 14, 2021
fd14e38
Moved `write_shared` to its own file
Nicholas-Baron Feb 14, 2021
afb8220
Corrected imports for render tests and mod files
Nicholas-Baron Feb 14, 2021
f223aff
Don't consume the expression in assert_matches!()'s failure case.
m-ou-se Mar 4, 2021
dbdaa12
Update rustdoc documentation
jyn514 Mar 2, 2021
4b30625
Don't warn for `missing_doc_examples` when item is #[doc(hidden)]
GuillaumeGomez Feb 13, 2021
91095b1
Update missing code example test
GuillaumeGomez Feb 13, 2021
186f139
Move visibility check inside the should_have_doc_example function
GuillaumeGomez Feb 15, 2021
ad30c39
Pass TyCtxt directly instead of DocContext in librustdoc::visit_ast::…
GuillaumeGomez Feb 23, 2021
e428799
No more need for borrow call
GuillaumeGomez Feb 23, 2021
1683cb1
Use cache access levels
GuillaumeGomez Mar 2, 2021
80fcdef
Add tracking issue for assert_matches.
m-ou-se Mar 4, 2021
3f41802
Rollup merge of #76716 - GuillaumeGomez:stop-complains-on-doc-hidden,…
JohnTitor Mar 5, 2021
e65024d
Rollup merge of #80763 - petrochenkov:pubusecrate, r=estebank
JohnTitor Mar 5, 2021
0863a46
Rollup merge of #81136 - Xavientois:io_reader_size_hint, r=cramertj
JohnTitor Mar 5, 2021
8c786c8
Rollup merge of #82088 - Nicholas-Baron:shorten_html_render, r=Guilla…
JohnTitor Mar 5, 2021
a482925
Rollup merge of #82642 - sfackler:jemalloc-zone, r=pnkfelix
JohnTitor Mar 5, 2021
65943f7
Rollup merge of #82690 - jyn514:remove-pass-docs, r=Manishearth
JohnTitor Mar 5, 2021
8aed2a0
Rollup merge of #82752 - JohnTitor:gat-ice-test, r=jackh726
JohnTitor Mar 5, 2021
dcf63d4
Rollup merge of #82764 - m-ou-se:map-try-insert, r=Amanieu
JohnTitor Mar 5, 2021
22de90c
Rollup merge of #82765 - oli-obk:polymorphization_regression, r=david…
JohnTitor Mar 5, 2021
a910b04
Rollup merge of #82770 - m-ou-se:assert-match, r=joshtriplett
JohnTitor Mar 5, 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 formatting
  • Loading branch information
Xavientois committed Jan 31, 2021
commit 265db94dc29b4e089e134795eac24b1b0a2faab1
12 changes: 2 additions & 10 deletions library/std/src/io/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2216,11 +2216,7 @@ impl<T: Read, U: Read> Read for Chain<T, U> {

unsafe fn initializer(&self) -> Initializer {
let initializer = self.first.initializer();
if initializer.should_initialize() {
initializer
} else {
self.second.initializer()
}
if initializer.should_initialize() { initializer } else { self.second.initializer() }
}
}

Expand All @@ -2239,11 +2235,7 @@ impl<T: BufRead, U: BufRead> BufRead for Chain<T, U> {
}

fn consume(&mut self, amt: usize) {
if !self.done_first {
self.first.consume(amt)
} else {
self.second.consume(amt)
}
if !self.done_first { self.first.consume(amt) } else { self.second.consume(amt) }
}
}

Expand Down