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

Remove a bunch of winapi 0.2 crates #22703

Merged
merged 2 commits into from Jan 16, 2019
Merged

Remove a bunch of winapi 0.2 crates #22703

merged 2 commits into from Jan 16, 2019

Conversation

@nox
Copy link
Member

nox commented Jan 16, 2019

This change is Reviewable

@highfive
Copy link

highfive commented Jan 16, 2019

Heads up! This PR modifies the following files:

  • @paulrouget: ports/servo/glutin_app/window.rs, ports/servo/Cargo.toml
@highfive
Copy link

highfive commented Jan 16, 2019

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@nox
Copy link
Member Author

nox commented Jan 16, 2019

I'm not actually sure that compiles on Windows 🤡

@nox nox force-pushed the bump branch from 3bde5f4 to ffbcc16 Jan 16, 2019
@SimonSapin
Copy link
Member

SimonSapin commented Jan 16, 2019

Let’s find out :)

@bors-servo r+

@bors-servo
Copy link
Contributor

bors-servo commented Jan 16, 2019

📌 Commit ffbcc16 has been approved by SimonSapin

@jdm
Copy link
Member

jdm commented Jan 16, 2019

error[E0432]: unresolved import `winapi::um::heapapi`
   --> components\allocator\lib.rs:103:21
    |
103 |     use winapi::um::heapapi::{GetProcessHeap, HeapSize, HeapValidate};
    |                     ^^^^^^^ could not find `heapapi` in `um`
@SimonSapin
Copy link
Member

SimonSapin commented Jan 16, 2019

There’s a heapapi Cargo feature

@nox
Copy link
Member Author

nox commented Jan 16, 2019

@bors-servo r=SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Jan 16, 2019

📌 Commit ea58f6b has been approved by SimonSapin

bors-servo added a commit that referenced this pull request Jan 16, 2019
Remove a bunch of winapi 0.2 crates

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22703)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 16, 2019

Testing commit ea58f6b with merge a75812b...

@bors-servo
Copy link
Contributor

bors-servo commented Jan 16, 2019

💔 Test failed - linux-rel-css

@jdm
Copy link
Member

jdm commented Jan 16, 2019

error[E0432]: unresolved import `rand::reseeding`
  --> components/rand/lib.rs:25:11
   |
25 | use rand::reseeding::{Reseeder, ReseedingRng};
   |           ^^^^^^^^^ could not find `reseeding` in `rand`

error[E0407]: method `next_u32` is not a member of trait `Rng`
  --> components/rand/lib.rs:64:5
   |
64 | /     fn next_u32(&mut self) -> u32 {
65 | |         self.rng.next_u32()
66 | |     }
   | |_____^ not a member of trait `Rng`

error[E0407]: method `next_u64` is not a member of trait `Rng`
  --> components/rand/lib.rs:69:5
   |
69 | /     fn next_u64(&mut self) -> u64 {
70 | |         self.rng.next_u64()
71 | |     }
   | |_____^ not a member of trait `Rng`

error[E0407]: method `reseed` is not a member of trait `SeedableRng`
  --> components/rand/lib.rs:86:5
   |
86 | /     fn reseed(&mut self, seed: &'a [usize]) {
87 | |         trace!("Manually reseeding ServoRng.");
88 | |         self.rng.reseed((ServoReseeder, as_isaac_seed(seed)))
89 | |     }
   | |_____^ not a member of trait `SeedableRng`

error[E0407]: method `next_u32` is not a member of trait `Rng`
   --> components/rand/lib.rs:139:5
    |
139 | /     fn next_u32(&mut self) -> u32 {
140 | |         self.rng.borrow_mut().next_u32()
141 | |     }
    | |_____^ not a member of trait `Rng`

error[E0407]: method `next_u64` is not a member of trait `Rng`
   --> components/rand/lib.rs:143:5
    |
143 | /     fn next_u64(&mut self) -> u64 {
144 | |         self.rng.borrow_mut().next_u64()
145 | |     }
    | |_____^ not a member of trait `Rng`

error[E0407]: method `fill_bytes` is not a member of trait `Rng`
   --> components/rand/lib.rs:148:5
    |
148 | /     fn fill_bytes(&mut self, bytes: &mut [u8]) {
149 | |         self.rng.borrow_mut().fill_bytes(bytes)
150 | |     }
    | |_____^ not a member of trait `Rng`

error: use of deprecated item 'rand::Rand': replaced by distributions::Standard
  --> components/rand/lib.rs:26:16
   |
26 | pub use rand::{Rand, Rng, SeedableRng};
   |                ^^^^
   |
   = note: `-D deprecated` implied by `-D warnings`

error: use of deprecated item 'rand::Rand': replaced by distributions::Standard
   --> components/rand/lib.rs:156:18
    |
156 | pub fn random<T: Rand>() -> T {
    |                  ^^^^

error[E0107]: wrong number of type arguments: expected 0, found 1
  --> components/rand/lib.rs:74:22
   |
74 | impl<'a> SeedableRng<&'a [usize]> for ServoRng {
   |                      ^^^^^^^^^^^ unexpected type argument

error: aborting due to 10 previous errors
@nox nox force-pushed the bump branch from ea58f6b to 600ce02 Jan 16, 2019
@nox
Copy link
Member Author

nox commented Jan 16, 2019

I removed the rand commit because it's not that useful and I don't want to spend the day doing the migration right now.

@nox
Copy link
Member Author

nox commented Jan 16, 2019

@bors-servo r=SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Jan 16, 2019

📌 Commit 600ce02 has been approved by SimonSapin

@bors-servo
Copy link
Contributor

bors-servo commented Jan 16, 2019

Testing commit 600ce02 with merge 7c043f1...

bors-servo added a commit that referenced this pull request Jan 16, 2019
Remove a bunch of winapi 0.2 crates

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/22703)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jan 16, 2019

@bors-servo bors-servo merged commit 600ce02 into master Jan 16, 2019
3 of 4 checks passed
3 of 4 checks passed
continuous-integration/appveyor/pr Waiting for AppVeyor build to complete
Details
Taskcluster (pull_request) TaskGroup: success
Details
Travis CI - Pull Request Build Passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Jan 16, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.