Updated deprecations.

rubinius · Jul 16, 2016 · 43e411b · 43e411b
1 parent 98e08b1
commit 43e411b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/core/deprecations.rb b/core/deprecations.rb
@@ -3,10 +3,5 @@ module Rubinius
     # "Description" => "Alternative"
     "Ruby 2.1 features that are incompatible with Ruby 2.2 are deprecated." =>
       "Use Ruby 2.2 features if they are available.",
-    "Rubinius::KERNEL_PATH is deprecated." => "Use Rubinius::CORE_PATH instead.",
-    "Support for 32-bit platforms is deprecated." =>
-      "Use 64-bit platforms or open an issue if 32-bit support is a critical feature.",
-    "Support for the GCC compiler is deprecated." =>
-      "Use clang or open an issue if GCC support is a critical feature.",
   }
 end
diff --git a/machine/drivers/cli.cpp b/machine/drivers/cli.cpp
@@ -109,7 +109,7 @@ int main(int argc, char** argv) {
       std::cerr << std::endl;
       std::cerr << "      BIN_PATH: " << RBX_BIN_PATH << std::endl;
       std::cerr << "  RUNTIME_PATH: " << RBX_RUNTIME_PATH << std::endl;
-      std::cerr << "   KERNEL_PATH: " << RBX_KERNEL_PATH << std::endl;
+      std::cerr << "     CORE_PATH: " << RBX_CORE_PATH << std::endl;
       std::cerr << "      LIB_PATH: " << RBX_LIB_PATH << std::endl;
       std::cerr << "     SITE_PATH: " << RBX_SITE_PATH << std::endl;
       std::cerr << "   VENDOR_PATH: " << RBX_VENDOR_PATH << std::endl;

diff --git a/machine/environment.cpp b/machine/environment.cpp
@@ -674,7 +674,7 @@ namespace rubinius {
     dir = prefix + RBX_BIN_PATH;
     if(stat(dir.c_str(), &st) == -1 || !S_ISDIR(st.st_mode)) return false;
 
-    dir = prefix + RBX_KERNEL_PATH;
+    dir = prefix + RBX_CORE_PATH;
     if(stat(dir.c_str(), &st) == -1 || !S_ISDIR(st.st_mode)) return false;
 
     dir = prefix + RBX_LIB_PATH;

diff --git a/machine/ontology.cpp b/machine/ontology.cpp
@@ -361,8 +361,6 @@ namespace rubinius {
       G(rubinius)->set_const(state, "RUNTIME_PATH", String::create(state, path.c_str()));
       path = prefix + RBX_BIN_PATH;
       G(rubinius)->set_const(state, "BIN_PATH", String::create(state, path.c_str()));
-      path = prefix + RBX_KERNEL_PATH;
-      G(rubinius)->set_const(state, "KERNEL_PATH", String::create(state, path.c_str()));
       path = prefix + RBX_CORE_PATH;
       G(rubinius)->set_const(state, "CORE_PATH", String::create(state, path.c_str()));
       path = prefix + RBX_LIB_PATH;