Replace @setup_workload by @compile_workload

Author: joa-quim

.github/workflows/ci.yml

@@ -27,7 +27,7 @@ jobs:
         version:
           #- '1.7' # Leave this line unchanged. '1' will automatically expand to the latest stable 1.x release of Julia.
           - '~1.10.0-0'
-          - '~1.11.0-0'
+          #- '~1.11.0-0'
           - '~1.12.0-0'
           - 'nightly'
         os:

src/GMT.jl

@@ -372,7 +372,7 @@ using GMT.Laszip
 #include("ImageFeatures/ImageFeatures.jl")
 #using GMT.ImageFeatures
 
-@setup_workload let
+@compile_workload let
 	G_API[1] = GMT_Create_Session("GMT", 2, GMT_SESSION_BITFLAGS)
 	GMT.parse_B(Dict(:frame => (annot=10, title="Ai Ai"), :grid => (pen=2, x=10, y=20)), "", " -Baf -BWSen");
 	GMT.parse_R(Dict(:xlim => (1,2), :ylim => (3,4), :zlim => (5,6)), "");

src/PrettyTables.jl

@@ -49,9 +49,7 @@ function crop_width_to_fit_string_in_field(str::AbstractString, field_width::Int
 	if add_continuation_char
 		cont_str_width = textwidth(continuation_char)
 
-		if add_space_in_continuation_char
-			cont_str_width += 1
-		end
+		add_space_in_continuation_char && (cont_str_width += 1)
 
 		Δ += cont_str_width
 
@@ -743,9 +741,7 @@ function _print_table_with_text_back_end(
 	# Check which columns must have fixed sizes.
 	columns_width isa Integer && (columns_width = fill(columns_width, num_columns))
 
-	if length(columns_width) != num_columns
-		error("The length of `columns_width` must be the same as the number of columns.")
-	end
+	(length(columns_width) != num_columns) && error("The length of `columns_width` must be the same as the number of columns.")
 
 	# The number of lines that must be skipped from printing ellipsis must be greater of equal 0.
 	(ellipsis_line_skip < 0) && (ellipsis_line_skip = 0)
@@ -1351,9 +1347,7 @@ function _is_cell_alignment_overridden(ptable::ProcessedTable, i::Int, j::Int)
 
 			# Search for alignment overrides in this cell.
 			for f in ptable._data_cell_alignment
-				alignment_override =
-					f(_getdata(ptable.data), ir, jr)::Union{Nothing, Symbol}
-
+				alignment_override = f(_getdata(ptable.data), ir, jr)::Union{Nothing, Symbol}
 				if _is_alignment_valid(alignment_override)
 					return true
 				end
@@ -1991,9 +1985,7 @@ function _update_column_width(column_width::Int, largest_cell_width::Int, column
 		end
 
 		# Make sure that the minimum column width is respected.
-		if (minimum_column_width > 0) && (minimum_column_width > column_width)
-			column_width = minimum_column_width
-		end
+		(minimum_column_width > 0) && (minimum_column_width > column_width) && (column_width = minimum_column_width)
 	else
 		column_width = column_width_specification
 	end
@@ -2027,11 +2019,7 @@ end
 
 # Return the available rows in `display`. If there is no row limit, this function returns -1.
 function _available_rows(display::Display)
-	if display.size[1] > 0
-		return display.size[1] - display.row
-	else
-		return -1
-	end
+	return (display.size[1] > 0) ? (display.size[1] - display.row) : -1
 end
 
 # Draw the continuation row when the table has filled the vertical space available. This
@@ -2574,11 +2562,7 @@ function _print_omitted_cell_summary(display::Display, num_omitted_cols::Int, nu
 	if show_omitted_cell_summary && ((num_omitted_cols + num_omitted_rows) > 0)
 		cs_str = _get_omitted_cell_string(num_omitted_rows, num_omitted_cols)
 
-		if display.size[2] > 0
-			table_display_width = min(table_width, display.size[2])
-		else
-			table_display_width = table_width
-		end
+		table_display_width = (display.size[2] > 0) ? min(table_width, display.size[2]) : table_width
 
 		if textwidth(cs_str) < table_display_width
 			cs_str = align_string(cs_str, table_display_width, :r)

src/common_options.jl

@@ -2846,7 +2846,7 @@ function get_color(val)::String
 	# Parse a color input.
 	# color1,color2[,color3,…] colorn can be a r/g/b triplet, a color name, or an HTML hexadecimal color (e.g. #aabbcc)
 	(isa(val, AbstractString) || isa(val, Symbol) || isa(val, Real)) && return isa(val, Bool) ? "" : string(val)
-	error("\tGET_COLOR: got an unsupported data type: $(typeof(val))")
+	error("\tGET_COLOR: got an unsupported data type")
 end
 function get_color(val::Tuple)::String
 	out::String = ""
@@ -2899,7 +2899,7 @@ end
 # ---------------------------------------------------------------------------------------------------
 function parse_units(val)::String
 	# Parse a units string in the form d|e|f|k|n|M|n|s or expanded
-	(isa(val, String) || isa(val, Symbol) || isa(val, Real)) && return string(val)
+	(isa(val, StrSymb) || isa(val, Real)) && return string(val)
 
 	!(isa(val, Tuple) && (length(val) == 2)) && error("PARSE_UNITS, got and unsupported data type: $(typeof(val))")
 	return string(val[1], parse_unit_unit(val[2]))
@@ -3379,9 +3379,9 @@ function vector4_attrib(; kwargs...)::String
 		if (isa(val, NamedTuple) || isa(val, AbstractDict))
 			ha::String = "0.075c";	hl::String = "0.3c";	hw::String = "0.25c"
 			dh = isa(val, NamedTuple) ? nt2dict(val) : val
-			haskey(dh, :arrowwidth) && (ha = string(dh[:arrowwidth]))
-			haskey(dh, :headlength) && (hl = string(dh[:headlength]))
-			haskey(dh, :headwidth)  && (hw = string(dh[:headwidth]))
+			haskey(dh, :arrowwidth) && (ha = string(dh[:arrowwidth])::String)
+			haskey(dh, :headlength) && (hl = string(dh[:headlength])::String)
+			haskey(dh, :headwidth)  && (hw = string(dh[:headwidth])::String)
 			hh::String = ha * '/' * hl * '/' * hw
 		elseif (isa(val, Tuple) && length(val) == 3)  hh = arg2str(val)
 		elseif (isa(val, String))                     hh = val		# No checking

src/psxy.jl

@@ -44,7 +44,7 @@ function _common_plot_xyz(cmd0::String, arg1, caller::String, O::Bool, K::Bool,
 
 	if (is_ternary)
 		opt_B::String = ""
-		if (haskey(d, :B))						# Not necessarely the case when ternary!
+		if (haskey(d, :B))								# Not necessarely the case when ternary!
 			cmd, opt_B = string(cmd, d[:B]), d[:B]		# B option was parsed in plot/ternary
 			delete!(d, :B)
 		end