Skip to content

[Rust] Fixes "common" sub crate using nightly and master #3965

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

Merged
nhynes merged 4 commits into from
Sep 22, 2019
Merged

[Rust] Fixes "common" sub crate using nightly and master #3965

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71320c1
Fixes type mismatches.
paddyhoran Sep 17, 2019
bcacbbb
Removes warning due to stabilized feature.
paddyhoran Sep 17, 2019
56c7855
Remove warning for stablized feature in macros
paddyhoran Sep 20, 2019
4be7408
Remove warning for stablized feature in frontend
paddyhoran Sep 20, 2019
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
2 changes: 1 addition & 1 deletion rust/common/src/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ pub struct TVMContext {
impl<'a> From<&'a TVMContext> for DLContext {
fn from(ctx: &'a TVMContext) -> Self {
Self {
device_type: ctx.device_type as u32,
device_type: ctx.device_type as i32,
device_id: ctx.device_id as i32,
}
}
Expand Down
2 changes: 1 addition & 1 deletion rust/common/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
//! This crate contains the refactored basic components required
//! for `runtime` and `frontend` TVM crates.

#![feature(box_syntax, type_alias_enum_variants, trait_alias)]
#![feature(box_syntax, trait_alias)]

#[macro_use]
extern crate failure;
Expand Down
2 changes: 1 addition & 1 deletion rust/common/src/packed_func.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ macro_rules! TVMPODValue {
use $name::*;
#[allow(non_upper_case_globals)]
unsafe {
match type_code {
match type_code as i32 {
DLDataTypeCode_kDLInt => Int($value.v_int64),
DLDataTypeCode_kDLUInt => UInt($value.v_int64),
DLDataTypeCode_kDLFloat => Float($value.v_float64),
Expand Down