rust_require 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bc920f52a113f72975ec221fca1fb106493c481
-  data.tar.gz: c2217f4c5a0abcca147ec2c05deb321c25e728eb
+  metadata.gz: 5a3163feda277069a1e4aaaebc61c95fb3e8f851
+  data.tar.gz: df216541319d78028d4bb3f63dd57a99ec7684d7
 SHA512:
-  metadata.gz: 0145328db7639bb2535230934fdf1848e0a684245e31cd6a9ca6066483a64d47fb14f556d34c20ad61f0d7dcddfecd6e516486dda87598338555150631c39441
-  data.tar.gz: 466cd131e3527f9f5877735a94f291544f468eaa0772f43412a8ef80c4078ac7a8b509c23481721a98e2abf419b68ac5d4365067eda990752c96cbc51f388cea
+  metadata.gz: 439bcf99dbcd0f22c975b91c2359bc79498ca2fe0ca73e8c1d95012bfa36777f85cfb212d163d96570ad47dbc6b189733444a797415871a5cf705a4b50295a92
+  data.tar.gz: 3a56fc6b74bf27b9d9c254486638a8189f7c44e24665f1b41f6afb2b309a56533c14f42dbfbc1b9b825630dbf7769af5d5fdecaf2590ca01fb47dcaa347bc2c8

data/lib/rust_require/c_wrapper_generator.rb

@@ -27,7 +27,7 @@ module Rust
       w << generate_fns(mod['fn_headers'], submod_string)
     end
 
-      # Generates wrapper fns for fn_headers (String)
+    # Generates wrapper fns for fn_headers (String)
     def generate_fns(fn_headers, submod_string)
       fn_headers.map do |fn|
         WrapperFn.new(submod_string + fn['name'], fn['inputs'], fn['output']).to_s

data/lib/rust_require/ruby_wrapper_generator.rb

@@ -28,9 +28,10 @@ module Rust
       end
 
       attach_fns(rust_module['fn_headers'], mod, mod_string)
+      attach_structs(rust_module['structs'], mod)
     end
 
-    # attaches items via FFI to mod
+    # attaches fns via FFI to mod
     def attach_fns(fn_headers, mod, mod_string)
       # add ffi and the rust lib to mod
       mod.extend FFI::Library
@@ -68,5 +69,20 @@ module Rust
         end
       end
     end
+
+    # attaches structs via FFI to mod
+    def attach_structs(struct_defs, mod)
+      struct_defs.each do |s|
+        fields = s['fields'].map do |name, type|
+          type = Rust::Types.find_type(type)
+          [name.to_sym, type.ffi_output_type]
+        end.flatten
+
+        struct = Class.new(FFI::Struct)
+        struct.layout *fields
+
+        mod.const_set(s['name'], struct)
+      end
+    end
   end
 end

data/lib/rust_require/rustc.rb

@@ -5,7 +5,7 @@ module Rust
     SOURCE_ANALYZER = Gem::Specification.find_by_name('rust_require').full_gem_path + '/ext/source_analyzer/lib/libsource_analyzer.so'
 
     # default rustc command
-    RUSTC_CMD = 'rustc --crate-type dylib -A dead_code'
+    RUSTC_CMD = 'rustc --crate-type dylib -A dead_code -A unused_features'
 
     # @output_path: output path for library generated by Rustc
     attr_accessor :output_path
@@ -35,9 +35,9 @@ module Rust
       gen = CWrapperGenerator.new(info_file)
 
       File.open(@tempfile, "w+") do |f|
-        # add necessary extern crate definitions #FIXME: if this proves to be unnecessary remove it
+        # add necessary extern crate definitions
         f << <<-SRC
-
+            #![feature(alloc)]
         SRC
 
         # add the actual file content
@@ -70,7 +70,7 @@ module Rust
         File.open(@input_path, "r") { |input| f << input.read }
       end
 
-      # use the lint to just parse the file (no output)
+      # use the lint to just parse the file (no code generation)
       print `RUST_REQUIRE_FILE=#{@info_file_path} #{RUSTC_CMD} -Z no-trans -L #{File.dirname(@input_path)} -L #{File.dirname(SOURCE_ANALYZER)} #{@tempfile}`
       raise "rust compiler error" if $? != 0
 

data/lib/rust_require/types/string.rb

@@ -1,3 +1,5 @@
+# deactivated for now, maybe reactivated later with explicit conversion
+
 module Rust
   module Types
     class String < Type
@@ -17,7 +19,19 @@ module Rust
         <<-CODE
         {
             let mut #{name} = #{name};
-            #{name}.shrink_to_fit();
+
+            // deallocate unused capacity if any
+            if #{name}.len() != #{name}.capacity() {
+                unsafe {
+                    let ptr = #{name}.as_mut_vec().as_mut_ptr();
+                    std::rt::heap::deallocate(
+                        ptr.offset(#{name}.len() as isize),
+                        #{name}.capacity() - #{name}.len(),
+                        std::mem::min_align_of::<u8>()
+                    );
+                }
+            }
+
             let tuple = (#{name}.as_ptr(), #{name}.len());
             std::mem::forget(#{name});
             tuple
@@ -72,6 +86,7 @@ module Rust
         str.encode!(Encoding::UTF_8)
         len = str.bytesize
         start = FFI::MemoryPointer.from_string(str)
+        start.autorelease = false # no GC
         Rust::Slice.from(start.address, len)
       end
     end

data/lib/rust_require/version.rb

@@ -1 +1 @@
-VERSION = "0.2.1"
+VERSION = "0.2.2"

data/lib/rust_require.rb

@@ -15,7 +15,9 @@ require_relative 'rust_require/ruby_wrapper_generator.rb'
 
 # Types
 require_relative 'rust_require/types/primitives.rb'
-require_relative 'rust_require/types/string.rb'
+
+# deactivated for now, maybe reactivated later with explicit conversion
+# require_relative 'rust_require/types/string.rb'
 
 class Module
   def rust_require(file)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rust_require
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Florian Lackner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-13 00:00:00.000000000 Z
+date: 2015-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi