Pull in consts from rex-arch gem...

pbarry-r7 · pbarry-r7 · commit 05afaa1162e2 · 2016-07-27T17:43:17.000-05:00
diff --git a/lib/msf/core.rb b/lib/msf/core.rb
@@ -16,6 +16,8 @@
 # The framework-core depends on Rex
 require 'rex'
 require 'rex/ui'
+require 'rex/arch'
+include Rex::Arch
 
 module Msf
   autoload :Author, 'msf/core/author'
diff --git a/lib/msf/core/payload/uuid.rb b/lib/msf/core/payload/uuid.rb
@@ -2,7 +2,6 @@
 
 require 'msf/core'
 require 'msf/core/module/platform'
-require 'rex/constants'
 require 'rex/text'
 
 #
diff --git a/lib/rex.rb b/lib/rex.rb
@@ -59,7 +59,6 @@ module Rex
 require 'rex/ole'
 
 # Generic classes
-require 'rex/constants'
 require 'rex/exceptions'
 require 'rex/transformer'
 require 'rex/random_identifier'
diff --git a/lib/rex/constants.rb b/lib/rex/constants.rb

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`
`3`	`3`	`require 'msf/core'`
`4`	`4`	`require 'msf/core/module/platform'`
`5`		`-require 'rex/constants'`
`6`	`5`	`require 'rex/text'`
`7`	`6`
`8`	`7`	`#`