Skip to content

Rollup of 7 pull requests #83727

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
Dylan-DPC-zz wants to merge 21 commits into from
Closed

Rollup of 7 pull requests #83727

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
c3cf93a
Fix diagnostic issue when using FakeReads in closures
roxelo Mar 26, 2021
1ef70d8
Reduce size of statements
roxelo Mar 30, 2021
c2c76a0
fix clippy error
roxelo Mar 30, 2021
fd66899
Suggest Pin/Box/Arc for more cases
estebank Mar 30, 2021
7528cc3
Point at `impl` and type defs introducing requirements on E0277
estebank Mar 30, 2021
923c122
Always mention `Box::pin` when dealing with `!Unpin`
estebank Mar 30, 2021
8f77356
give full path of constraint in suggest_constraining_type_param
0xPoe Mar 30, 2021
ce66588
Add a regression test for issue-68830
JohnTitor Mar 31, 2021
e7821e5
Fix documentation of conversion from String to OsString
steffahn Mar 31, 2021
f5e7dbb
Add a few missing links, fix a typo
steffahn Mar 31, 2021
7509aa1
Apply suggestions from code review
steffahn Mar 31, 2021
82c6709
Clarify `--print target-list` is a rustc's option
JohnTitor Mar 31, 2021
9acf558
Update LLVM with another wasm simd fix
alexcrichton Mar 31, 2021
06b82ab
review comments
estebank Mar 31, 2021
5b381b7
Rollup merge of #83521 - sexxi-goose:quick-diagnostic-fix, r=nikomats…
Dylan-DPC Mar 31, 2021
cb59053
Rollup merge of #83673 - hi-rustin:rustin-patch-suggestion, r=estebank
Dylan-DPC Mar 31, 2021
a41cb7d
Rollup merge of #83689 - estebank:cool-bears-hot-tip, r=davidtwco
Dylan-DPC Mar 31, 2021
cff8c5f
Rollup merge of #83699 - JohnTitor:issue-68830, r=Dylan-DPC
Dylan-DPC Mar 31, 2021
3499ec6
Rollup merge of #83700 - steffahn:string_to_pathbuf_conversion_docume…
Dylan-DPC Mar 31, 2021
cbd72e4
Rollup merge of #83711 - JohnTitor:more-friendly-unknown-target-error…
Dylan-DPC Mar 31, 2021
5eb680f
Rollup merge of #83712 - alexcrichton:more-wasm-simd-llvm-updates, r=…
Dylan-DPC Mar 31, 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
Apply suggestions from code review 
More links, one more occurrence of “a OsString”

Co-authored-by: Yuki Okushi <[email protected]>
  • Loading branch information
@steffahn @JohnTitor
steffahn and JohnTitor committed Mar 31, 2021
commit 7509aa108c6bb852062e72de6fef5297f0d624e9
4 changes: 2 additions & 2 deletions library/std/src/path.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1467,7 +1467,7 @@ impl<T: ?Sized + AsRef<OsStr>> From<&T> for PathBuf {

#[stable(feature = "rust1", since = "1.0.0")]
impl From<OsString> for PathBuf {
/// Converts a [`OsString`] into a [`PathBuf`]
/// Converts an [`OsString`] into a [`PathBuf`]
///
/// This conversion does not allocate or copy memory.
#[inline]
Expand All @@ -1478,7 +1478,7 @@ impl From<OsString> for PathBuf {

#[stable(feature = "from_path_buf_for_os_string", since = "1.14.0")]
impl From<PathBuf> for OsString {
/// Converts a [`PathBuf`] into a [`OsString`]
/// Converts a [`PathBuf`] into an [`OsString`]
///
/// This conversion does not allocate or copy memory.
#[inline]
Expand Down