Skip to content

Commit

Permalink
Merge pull request #24 from hexedtech/release/0.7.1
Browse files Browse the repository at this point in the history
Release/0.7.1
  • Loading branch information
zaaarf authored Sep 25, 2024
2 parents eb797f6 + 4191fc2 commit 03cb9a5
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ authors = [
]
license = "GPL-3.0-only"
edition = "2021"
version = "0.7.0"
version = "0.7.1"
exclude = ["dist/*"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion dist/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

group = 'mp.code'
version = '0.7.0'
version = '0.7.1'

java {
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_11
Expand Down
8 changes: 4 additions & 4 deletions dist/js/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@codemp/native",
"version": "0.7.0",
"version": "0.7.1",
"description": "code multiplexer -- javascript bindings",
"keywords": [
"codemp",
Expand Down Expand Up @@ -35,8 +35,8 @@
}
},
"optionalDependencies": {
"@codemp/native-win32-x64-msvc": "0.7.0",
"@codemp/native-darwin-arm64": "0.7.0",
"@codemp/native-linux-x64-gnu": "0.7.0"
"@codemp/native-win32-x64-msvc": "0.7.1",
"@codemp/native-darwin-arm64": "0.7.1",
"@codemp/native-linux-x64-gnu": "0.7.1"
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package = "codemp"
version = "0.7.0-1"
version = "0.7.1-1"

source = {
url = "git+https://github.com/hexedtech/codemp",
tag = "v0.7.0",
tag = "v0.7.1",
}

dependencies = {
Expand Down
2 changes: 1 addition & 1 deletion src/api/change.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
/// To delete a the fourth character we should send a.
/// `TextChange { start: 3, end: 4, content: "".into(), hash: None }`
///
/// ```
/// ```no_run
/// let change = codemp::api::TextChange {
/// start: 6, end: 11,
/// content: "mom".to_string(), hash: None
Expand Down
7 changes: 3 additions & 4 deletions src/ffi/js/buffer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,14 @@ impl BufferController {
}

#[napi(js_name = "clear_callback")]
pub fn js_clear_callback(&self) -> napi::Result<()> {
pub fn js_clear_callback(&self) -> () {
self.clear_callback();
Ok(())
}


#[napi(js_name = "get_path")]
pub fn js_path(&self) -> napi::Result<&str> {
Ok(self.path())
pub fn js_path(&self) -> &str {
self.path()
}

#[napi(js_name = "poll")]
Expand Down
4 changes: 2 additions & 2 deletions src/ffi/js/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ impl Client {

#[napi(js_name = "leave_workspace")]
/// leave workspace and disconnect, returns true if workspace was active
pub async fn js_leave_workspace(&self, workspace: String) -> napi::Result<bool> {
Ok(self.leave_workspace(&workspace))
pub async fn js_leave_workspace(&self, workspace: String) -> bool {
self.leave_workspace(&workspace)
}

#[napi(js_name = "get_workspace")]
Expand Down
10 changes: 5 additions & 5 deletions src/ffi/js/ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ use napi_derive::napi;


#[napi(js_name = "hash")]
pub fn js_hash(str : String) -> napi::Result<i64>{
Ok(crate::ext::hash(str))
pub fn js_hash(data: String) -> i64 {
crate::ext::hash(data)
}

#[napi(js_name = "version")]
pub fn js_version(str : String) -> napi::Result<String>{
Ok(crate::version())
}
pub fn js_version() -> String {
crate::version()
}

0 comments on commit 03cb9a5

Please sign in to comment.