Skip to content

Bump rust toolchain to 2018-03-24.#20589

Closed
mrowqa wants to merge 5 commits intoservo:masterfrom
mrowqa:bump-toolchain
Closed

Bump rust toolchain to 2018-03-24.#20589
mrowqa wants to merge 5 commits intoservo:masterfrom
mrowqa:bump-toolchain

Conversation

@mrowqa
Copy link

@mrowqa mrowqa commented Apr 8, 2018

Newer toolchain contains bugfix required by #14902.


  • ./mach build -d does not report any errors
    It reports some warnings about deprecated items in rust-webvr-api.
  • ./mach build-geckolib does not report any errors
  • ./mach test-tidy does not report any errors

This change is Reviewable

@highfive
Copy link

highfive commented Apr 8, 2018

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @mbrubeck (or someone else) soon.

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Apr 8, 2018
@mrowqa
Copy link
Author

mrowqa commented Apr 8, 2018

Taking a look at this it seems like NonZero i Zeroable have been removed, so I have left only the manual implementation of it.
CC @nikomatsakis

unsafe { BrowsingContextIndex(NonZero::new_unchecked(8765)) };
#[cfg(feature = "unstable")]
pub const TEST_BROWSING_CONTEXT_ID: BrowsingContextId =
BrowsingContextId { namespace_id: TEST_NAMESPACE, index: TEST_BROWSING_CONTEXT_INDEX };
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Failed with:

error[E0015]: calls in constants are limited to constant functions, struct and enum constructors
   --> components/msg/constellation_msg.rs:358:71
    |
358 | pub const TEST_PIPELINE_INDEX: PipelineIndex = unsafe { PipelineIndex(NonZero::new_unchecked(5678)) };
    |                                                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error[E0015]: calls in constants are limited to constant functions, struct and enum constructors
   --> components/msg/constellation_msg.rs:364:35
    |
364 |     unsafe { BrowsingContextIndex(NonZero::new_unchecked(8765)) };
    |                                   ^^^^^^^^^^^^^^^^^^^^^^^^^^^^

error: aborting due to 2 previous errors

@SimonSapin
Copy link
Member

This will likely hit the same WebBluetooth test failures as #20474 (comment) which still need to be investigated.

@SimonSapin
Copy link
Member

By the way #20474 already takes care of the nonzero stuff.

@mrowqa
Copy link
Author

mrowqa commented Apr 8, 2018

Oh, I haven't noticed this PR. In this case my change looks redundant.

@mrowqa mrowqa closed this Apr 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-awaiting-review There is new code that needs to be reviewed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants