Skip to content

Commit 9d56a89

Browse files
authored
Release 0.67.0 (#154)
* Bump version to 0.67.0 * Update Changelog * Silence warnings
1 parent 1e6655f commit 9d56a89

File tree

9 files changed

+54
-54
lines changed

9 files changed

+54
-54
lines changed

CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Changelog
22
All notable changes to this project will be documented in this file.
33

4-
## [Unreleased]
4+
## [0.67.0] - 2019-08-28
55
### Added
66
- Add an `alternatives` attribute, containing less likely alternatives, to ([#153](https://github.com/snipsco/snips-nlu-ontology/pull/153)):
77
- `IntentParserResult`
@@ -201,7 +201,7 @@ All notable changes to this project will be documented in this file.
201201
### Changed
202202
- Updated Rustling ontology to `0.16.4`
203203

204-
[Unreleased]: https://github.com/snipsco/snips-nlu-ontology/compare/0.66.0...HEAD
204+
[0.67.0]: https://github.com/snipsco/snips-nlu-ontology/compare/0.66.0...0.67.0
205205
[0.66.0]: https://github.com/snipsco/snips-nlu-ontology/compare/0.65.0...0.66.0
206206
[0.65.0]: https://github.com/snipsco/snips-nlu-ontology/compare/0.64.8...0.65.0
207207
[0.64.8]: https://github.com/snipsco/snips-nlu-ontology/compare/0.64.7...0.64.8

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "snips-nlu-ontology"
3-
version = "0.67.0-SNAPSHOT"
3+
version = "0.67.0"
44
authors = [
55
"Adrien Ball <adrien.ball@snips.ai>",
66
"Thibaut Lorrain <thibaut.lorrain@snips.ai>",

doc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "snips-nlu-ontology-doc"
3-
version = "0.67.0-SNAPSHOT"
3+
version = "0.67.0"
44
authors = ["Adrien Ball <adrien.ball@snips.ai>"]
55
edition = "2018"
66

ffi/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "snips-nlu-ontology-ffi"
3-
version = "0.67.0-SNAPSHOT"
3+
version = "0.67.0"
44
authors = ["Kevin Lefevre <kevin.lefevre@snips.ai>"]
55
edition = "2018"
66

ffi/ffi-macros/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "snips-nlu-ontology-ffi-macros"
3-
version = "0.67.0-SNAPSHOT"
3+
version = "0.67.0"
44
authors = [
55
"Kevin Lefevre <kevin.lefevre@snips.ai>",
66
"Thibaut Lorrain <thibaut.lorrain@snips.ai>",

ffi/ffi-macros/src/builtin_entity.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ pub struct CBuiltinEntity {
2020
pub entity: CSlotValue,
2121
pub entity_kind: *const libc::c_char,
2222
pub value: *const libc::c_char,
23-
pub range_start: libc::int32_t,
24-
pub range_end: libc::int32_t,
23+
pub range_start: i32,
24+
pub range_end: i32,
2525
}
2626

2727
impl From<BuiltinEntity> for CBuiltinEntity {
@@ -30,8 +30,8 @@ impl From<BuiltinEntity> for CBuiltinEntity {
3030
entity: CSlotValue::from(e.entity),
3131
entity_kind: CString::new(e.entity_kind.identifier()).unwrap().into_raw(),
3232
value: CString::new(e.value).unwrap().into_raw(),
33-
range_start: e.range.start as libc::int32_t,
34-
range_end: e.range.end as libc::int32_t,
33+
range_start: e.range.start as i32,
34+
range_end: e.range.end as i32,
3535
}
3636
}
3737
}
@@ -47,13 +47,13 @@ impl Drop for CBuiltinEntity {
4747
#[derive(Debug)]
4848
pub struct CBuiltinEntityArray {
4949
pub data: *const CBuiltinEntity,
50-
pub size: libc::int32_t, // Note: we can't use `libc::size_t` because it's not supported by JNA
50+
pub size: i32, // Note: we can't use `libc::size_t` because it's not supported by JNA
5151
}
5252

5353
impl From<Vec<CBuiltinEntity>> for CBuiltinEntityArray {
5454
fn from(input: Vec<CBuiltinEntity>) -> Self {
5555
Self {
56-
size: input.len() as libc::int32_t,
56+
size: input.len() as i32,
5757
data: Box::into_raw(input.into_boxed_slice()) as *const CBuiltinEntity,
5858
}
5959
}
@@ -93,7 +93,7 @@ pub fn all_builtin_entities() -> CStringArray {
9393

9494
CStringArray {
9595
data: ALL.0.as_ptr() as *const *const libc::c_char,
96-
size: ALL.0.len() as libc::int32_t,
96+
size: ALL.0.len() as i32,
9797
}
9898
}
9999

@@ -113,7 +113,7 @@ pub fn all_grammar_entities() -> CStringArray {
113113

114114
CStringArray {
115115
data: ALL.0.as_ptr() as *const *const libc::c_char,
116-
size: ALL.0.len() as libc::int32_t,
116+
size: ALL.0.len() as i32,
117117
}
118118
}
119119

@@ -133,7 +133,7 @@ pub fn all_gazetteer_entities() -> CStringArray {
133133

134134
CStringArray {
135135
data: ALL.0.as_ptr() as *const *const libc::c_char,
136-
size: ALL.0.len() as libc::int32_t,
136+
size: ALL.0.len() as i32,
137137
}
138138
}
139139

ffi/ffi-macros/src/language.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ pub fn supported_languages() -> CStringArray {
2727

2828
CStringArray {
2929
data: ALL.0.as_ptr() as *const *const libc::c_char,
30-
size: ALL.0.len() as libc::int32_t,
30+
size: ALL.0.len() as i32,
3131
}
3232
}

ffi/ffi-macros/src/ontology.rs

+37-37
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ impl AsRust<IntentParserResult> for CIntentParserResult {
5151
impl Drop for CIntentParserResult {
5252
fn drop(&mut self) {
5353
take_back_c_string!(self.input);
54-
unsafe { CIntentClassifierResult::drop_raw_pointer(self.intent) };
55-
unsafe { CSlotList::drop_raw_pointer(self.slots) };
56-
unsafe { CIntentParserAlternativeArray::drop_raw_pointer(self.alternatives) };
54+
let _ = unsafe { CIntentClassifierResult::drop_raw_pointer(self.intent) };
55+
let _ = unsafe { CSlotList::drop_raw_pointer(self.slots) };
56+
let _ = unsafe { CIntentParserAlternativeArray::drop_raw_pointer(self.alternatives) };
5757
}
5858
}
5959

@@ -87,8 +87,8 @@ impl AsRust<IntentParserAlternative> for CIntentParserAlternative {
8787

8888
impl Drop for CIntentParserAlternative {
8989
fn drop(&mut self) {
90-
unsafe { CIntentClassifierResult::drop_raw_pointer(self.intent) };
91-
unsafe { CSlotList::drop_raw_pointer(self.slots) };
90+
let _ = unsafe { CIntentClassifierResult::drop_raw_pointer(self.intent) };
91+
let _ = unsafe { CSlotList::drop_raw_pointer(self.slots) };
9292
}
9393
}
9494

@@ -99,13 +99,13 @@ pub struct CIntentParserAlternativeArray {
9999
/// Pointer to the first result of the list
100100
pub intent_parser_alternatives: *const CIntentParserAlternative,
101101
/// Number of results in the list
102-
pub size: libc::int32_t,
102+
pub size: i32,
103103
}
104104

105105
impl From<Vec<IntentParserAlternative>> for CIntentParserAlternativeArray {
106106
fn from(input: Vec<IntentParserAlternative>) -> Self {
107107
Self {
108-
size: input.len() as libc::int32_t,
108+
size: input.len() as i32,
109109
intent_parser_alternatives: Box::into_raw(
110110
input
111111
.into_iter()
@@ -190,13 +190,13 @@ pub struct CIntentClassifierResultArray {
190190
/// Pointer to the first result of the list
191191
pub intent_classifier_results: *const CIntentClassifierResult,
192192
/// Number of results in the list
193-
pub size: libc::int32_t,
193+
pub size: i32,
194194
}
195195

196196
impl From<Vec<IntentClassifierResult>> for CIntentClassifierResultArray {
197197
fn from(input: Vec<IntentClassifierResult>) -> Self {
198198
Self {
199-
size: input.len() as libc::int32_t,
199+
size: input.len() as i32,
200200
intent_classifier_results: Box::into_raw(
201201
input
202202
.into_iter()
@@ -243,13 +243,13 @@ pub struct CSlotList {
243243
/// Pointer to the first slot of the list
244244
pub slots: *const CSlot,
245245
/// Number of slots in the list
246-
pub size: libc::int32_t, // Note: we can't use `libc::size_t` because it's not supported by JNA
246+
pub size: i32, // Note: we can't use `libc::size_t` because it's not supported by JNA
247247
}
248248

249249
impl From<Vec<Slot>> for CSlotList {
250250
fn from(input: Vec<Slot>) -> Self {
251251
Self {
252-
size: input.len() as libc::int32_t,
252+
size: input.len() as i32,
253253
slots: Box::into_raw(
254254
input
255255
.into_iter()
@@ -300,9 +300,9 @@ pub struct CSlot {
300300
/// Name of the slot
301301
pub slot_name: *const libc::c_char,
302302
/// Start index of raw value in input text
303-
pub range_start: libc::int32_t,
303+
pub range_start: i32,
304304
/// End index of raw value in input text
305-
pub range_end: libc::int32_t,
305+
pub range_end: i32,
306306
/// Confidence score of the slot
307307
pub confidence_score: libc::c_float,
308308
}
@@ -313,8 +313,8 @@ impl From<Slot> for CSlot {
313313
raw_value: CString::new(input.raw_value).unwrap().into_raw(),
314314
value: CSlotValue::from(input.value).into_raw_pointer(),
315315
alternatives: CSlotValueArray::from(input.alternatives).into_raw_pointer(),
316-
range_start: input.range.start as libc::int32_t,
317-
range_end: input.range.end as libc::int32_t,
316+
range_start: input.range.start as i32,
317+
range_end: input.range.end as i32,
318318
entity: CString::new(input.entity).unwrap().into_raw(),
319319
slot_name: CString::new(input.slot_name).unwrap().into_raw(),
320320
confidence_score: input
@@ -348,8 +348,8 @@ impl Drop for CSlot {
348348
take_back_c_string!(self.raw_value);
349349
take_back_c_string!(self.entity);
350350
take_back_c_string!(self.slot_name);
351-
unsafe { CSlotValue::drop_raw_pointer(self.value) };
352-
unsafe { CSlotValueArray::drop_raw_pointer(self.alternatives) };
351+
let _ = unsafe { CSlotValue::drop_raw_pointer(self.value) };
352+
let _ = unsafe { CSlotValueArray::drop_raw_pointer(self.alternatives) };
353353
}
354354
}
355355

@@ -448,7 +448,7 @@ pub type CNumberValue = libc::c_double;
448448
/// Representation of a percentage value
449449
pub type CPercentageValue = libc::c_double;
450450
/// Representation of an ordinal value
451-
pub type COrdinalValue = libc::int64_t;
451+
pub type COrdinalValue = i64;
452452

453453
/// Enum representing the grain of a resolved date related value
454454
#[repr(C)]
@@ -668,36 +668,36 @@ impl Drop for CTemperatureValue {
668668
#[derive(Debug)]
669669
pub struct CDurationValue {
670670
/// Number of years in the duration
671-
pub years: libc::int64_t,
671+
pub years: i64,
672672
/// Number of quarters in the duration
673-
pub quarters: libc::int64_t,
673+
pub quarters: i64,
674674
/// Number of months in the duration
675-
pub months: libc::int64_t,
675+
pub months: i64,
676676
/// Number of weeks in the duration
677-
pub weeks: libc::int64_t,
677+
pub weeks: i64,
678678
/// Number of days in the duration
679-
pub days: libc::int64_t,
679+
pub days: i64,
680680
/// Number of hours in the duration
681-
pub hours: libc::int64_t,
681+
pub hours: i64,
682682
/// Number of minutes in the duration
683-
pub minutes: libc::int64_t,
683+
pub minutes: i64,
684684
/// Number of seconds in the duration
685-
pub seconds: libc::int64_t,
685+
pub seconds: i64,
686686
/// Precision of the resolved value
687687
pub precision: SNIPS_PRECISION,
688688
}
689689

690690
impl From<DurationValue> for CDurationValue {
691691
fn from(value: DurationValue) -> Self {
692692
Self {
693-
years: value.years as libc::int64_t,
694-
quarters: value.quarters as libc::int64_t,
695-
months: value.months as libc::int64_t,
696-
weeks: value.weeks as libc::int64_t,
697-
days: value.days as libc::int64_t,
698-
hours: value.hours as libc::int64_t,
699-
minutes: value.minutes as libc::int64_t,
700-
seconds: value.seconds as libc::int64_t,
693+
years: value.years as i64,
694+
quarters: value.quarters as i64,
695+
months: value.months as i64,
696+
weeks: value.weeks as i64,
697+
days: value.days as i64,
698+
hours: value.hours as i64,
699+
minutes: value.minutes as i64,
700+
seconds: value.seconds as i64,
701701
precision: SNIPS_PRECISION::from(value.precision),
702702
}
703703
}
@@ -827,7 +827,7 @@ impl AsRust<SlotValue> for CSlotValue {
827827

828828
impl Drop for CSlotValue {
829829
fn drop(&mut self) {
830-
unsafe {
830+
let _ = unsafe {
831831
match self.value_type {
832832
SNIPS_SLOT_VALUE_TYPE::SNIPS_SLOT_VALUE_TYPE_CUSTOM => {
833833
CString::drop_raw_pointer(self.value)
@@ -886,13 +886,13 @@ pub struct CSlotValueArray {
886886
/// Pointer to the first slot value of the list
887887
pub slot_values: *const CSlotValue,
888888
/// Number of slot values in the list
889-
pub size: libc::int32_t, // Note: we can't use `libc::size_t` because it's not supported by JNA
889+
pub size: i32, // Note: we can't use `libc::size_t` because it's not supported by JNA
890890
}
891891

892892
impl From<Vec<SlotValue>> for CSlotValueArray {
893893
fn from(input: Vec<SlotValue>) -> Self {
894894
Self {
895-
size: input.len() as libc::int32_t,
895+
size: input.len() as i32,
896896
slot_values: Box::into_raw(
897897
input
898898
.into_iter()

platforms/kotlin/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99
}
1010

11-
version = "0.67.0-SNAPSHOT"
11+
version = "0.67.0"
1212
group = "ai.snips"
1313

1414

0 commit comments

Comments
 (0)