Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rubinius/rubinius
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 46933dd633b5
Choose a base ref
...
head repository: rubinius/rubinius
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 731e807572c2
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Apr 1, 2016

  1. Removed deprecated CompiledMethod and StaticScope. 

    Also adds deprecation for CallCustom.
    @brixen
    brixen committed Apr 1, 2016
    Copy the full SHA
    375d8b4 View commit details

  2. Don't start Metrics if not requested. 

    Eventually, we'll add an API to start this on demand via the Console.
    @brixen
    brixen committed Apr 1, 2016
    Copy the full SHA
    731e807 View commit details
Showing with 8 additions and 15 deletions.
  1. +0 −4 core/compiled_code.rb
  2. +0 −5 core/constant_scope.rb
  3. +2 −2 core/deprecations.rb
  4. +6 −4 machine/shared_state.cpp
4 changes: 0 additions & 4 deletions core/compiled_code.rb
View file
Original file line number Diff line number Diff line change
@@ -698,8 +698,4 @@ def to_s
end
end
end

# NOTE: Temporary alias for backwards compatibility. CompiledMethod is
# deprecated. Client code should use CompiledCode.
CompiledMethod = CompiledCode
end
5 changes: 0 additions & 5 deletions core/constant_scope.rb
View file
Original file line number Diff line number Diff line change
@@ -173,9 +173,4 @@ def const_set(name, value)
@module.const_set name, value
end
end

# NOTE: Temporary alias for backwards compatibility. StaticScope will
# eventually be deprecated in favor of ConstantScope.
StaticScope = ConstantScope
end

4 changes: 2 additions & 2 deletions core/deprecations.rb
View file
Original file line number Diff line number Diff line change
@@ -3,8 +3,8 @@ 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::CompiledMethod is deprecated." => "Use Rubinius::CompiledCode instead.",
"Rubinius::StaticScope is deprecated." => "Use Rubinius::ConstantScope instead.",
"Rubinius::KERNEL_PATH is deprecated." => "Use Rubinius::CORE_PATH instead.",
"CallCustom is deprecated." =>
"The replacement will be new executable resolution, cache, and invoke machine instructions.",
}
end
10 changes: 6 additions & 4 deletions machine/shared_state.cpp
View file
Original file line number Diff line number Diff line change
@@ -137,10 +137,12 @@ namespace rubinius {
}

metrics::Metrics* SharedState::start_metrics(STATE) {
if(!metrics_) {
metrics_ = new metrics::Metrics(state);
metrics_->start(state);
metrics_->init_ruby_metrics(state);
if(state->shared().config.system_metrics_target.value.compare("none")) {
if(!metrics_) {
metrics_ = new metrics::Metrics(state);
metrics_->start(state);
metrics_->init_ruby_metrics(state);
}
}

return metrics_;