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

[beta] backport #73326

Merged
merged 19 commits into from
Jun 15, 2020
Merged

[beta] backport #73326

merged 19 commits into from
Jun 15, 2020

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Jun 13, 2020

This is a beta backport rollup of the following:

r? @ghost

dtolnay and others added 16 commits June 13, 2020 15:44
These lead to inference regressions (mostly in tests) in code that looks
like:

    let socket = std::net::SocketAddrV4::new(std::net::Ipv4Addr::new(127, 0, 0, 1), 8080);
    assert_eq!(socket, "127.0.0.1:8080".parse().unwrap());

That compiles as of stable 1.44.0 but fails in beta with:

    error[E0284]: type annotations needed
     --> src/main.rs:3:41
      |
    3 |     assert_eq!(socket, "127.0.0.1:8080".parse().unwrap());
      |                                         ^^^^^ cannot infer type for type parameter `F` declared on the associated function `parse`
      |
      = note: cannot satisfy `<_ as std::str::FromStr>::Err == _`
    help: consider specifying the type argument in the method call
      |
    3 |     assert_eq!(socket, "127.0.0.1:8080".parse::<F>().unwrap());
      |
…s-storage-analysis, r=tmandry"

This reverts commit 458a3e7, reversing
changes made to d9417b3.
Co-authored-by: Aaron1011 <aa1ronham@gmail.com>
@Mark-Simulacrum
Copy link
Member Author

r? @ecstatic-morse on 4f75a62 -- there were merge conflicts backporting #73153 directly so I instead did a git revert -m1 458a3e76294fd859fb037f425404180c91e14767 which didn't merge conflict. I'm not sure if the fix is equivalent to that though or if you had something more targeted in mind.

@ecstatic-morse
Copy link
Contributor

Looks good to me. #73153 left in a file (init_locals.rs) that is removed in this backport, but it's not used on beta, so this is fine.

@Mark-Simulacrum
Copy link
Member Author

@bors r=ecstatic-morse,Mark-Simulacrum p=1 rollup=never

Thanks!

@bors
Copy link
Contributor

bors commented Jun 13, 2020

📌 Commit ec07453 has been approved by ecstatic-morse,Mark-Simulacrum

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 13, 2020
@Dylan-DPC-zz
Copy link

bumping the priority

@bors p=10

@Aaron1011
Copy link
Member

@bors retry

@bors
Copy link
Contributor

bors commented Jun 14, 2020

⌛ Testing commit ec07453 with merge 3f89e52e998c5138222a1ab7634371ad051d2193...

@bors
Copy link
Contributor

bors commented Jun 14, 2020

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 14, 2020
@ehuss
Copy link
Contributor

ehuss commented Jun 14, 2020

Oh, I'm sorry, I neglected to test on Windows. My PR was missing e658200 from #72901.

@ehuss
Copy link
Contributor

ehuss commented Jun 15, 2020

Can you update Cargo to include rust-lang/cargo#8361?

@Mark-Simulacrum
Copy link
Member Author

@bors r=ecstatic-morse,Mark-Simulacrum p=1 rollup=never

Included both.

@bors
Copy link
Contributor

bors commented Jun 15, 2020

📌 Commit 089d28b has been approved by ecstatic-morse,Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 15, 2020
@Dylan-DPC-zz
Copy link

bumping it @bors p=10

@bors
Copy link
Contributor

bors commented Jun 15, 2020

⌛ Testing commit 089d28b with merge 1dc0f6d...

@bors
Copy link
Contributor

bors commented Jun 15, 2020

☀️ Test successful - checks-azure
Approved by: ecstatic-morse,Mark-Simulacrum
Pushing 1dc0f6d to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 15, 2020
@bors bors merged commit 1dc0f6d into rust-lang:beta Jun 15, 2020
Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 20, 2020
Update bootstrap to rustc 1.45.0-beta.2 (1dc0f6d 2020-06-15)

Pulls in changes from rust-lang#73326.

Closes rust-lang#73286
Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 20, 2020
Update bootstrap to rustc 1.45.0-beta.2 (1dc0f6d 2020-06-15)

Pulls in changes from rust-lang#73326.

Closes rust-lang#73286
Manishearth added a commit to Manishearth/rust that referenced this pull request Jun 20, 2020
Update bootstrap to rustc 1.45.0-beta.2 (1dc0f6d 2020-06-15)

Pulls in changes from rust-lang#73326.

Closes rust-lang#73286
@cuviper cuviper added this to the 1.45 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet