Skip to content

core: Add -frust-compile-core flag #4344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CohenArthur wants to merge 1 commit into
base: master
Choose a base branch
from
+60 −35
Open

core: Add -frust-compile-core flag #4344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion gcc/rust/ast/rust-ast-builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,8 @@ std::unique_ptr<Stmt>
Builder::discriminant_value (std::string binding_name, std::string instance)
{
auto intrinsic = ptrify (
path_in_expression ({"core", "intrinsics", "discriminant_value"}, true));
path_in_expression ({get_path_start (), "intrinsics", "discriminant_value"},
true));

return let (identifier_pattern (binding_name), nullptr,
call (std::move (intrinsic), identifier (instance)));
Expand Down
17 changes: 13 additions & 4 deletions gcc/rust/ast/rust-ast-builder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include "rust-ast.h"
#include "rust-item.h"
#include "rust-operators.h"
#include <initializer_list>
#include "options.h"

namespace Rust {
namespace AST {
Expand Down Expand Up @@ -332,10 +332,19 @@ class Builder
/* Location of the generated AST nodes */
location_t loc;

const char *get_path_start () const
{
if (flag_compile_core)
return "crate";
else
return "core";
}

private:
/* Some constexpr helpers for some of the builders */
static constexpr std::initializer_list<const char *> discriminant_value_path
= {"core", "intrinsics", "discriminant_value"};
// /* Some constexpr helpers for some of the builders */
// static constexpr std::initializer_list<const char *>
// discriminant_value_path
// = {"core", "intrinsics", "discriminant_value"};
};

} // namespace AST
Expand Down
11 changes: 6 additions & 5 deletions gcc/rust/expand/rust-derive-debug.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,11 @@ DeriveDebug::stub_debug_fn ()

auto self = builder.self_ref_param ();

auto return_type
= ptrify (builder.type_path ({"core", "fmt", "Result"}, true));
auto return_type = ptrify (
builder.type_path ({builder.get_path_start (), "fmt", "Result"}, true));

auto mut_fmt_type_inner
= ptrify (builder.type_path ({"core", "fmt", "Formatter"}, true));
auto mut_fmt_type_inner = ptrify (
builder.type_path ({builder.get_path_start (), "fmt", "Formatter"}, true));

auto mut_fmt_type
= builder.reference_type (std::move (mut_fmt_type_inner), true);
Expand All @@ -81,7 +81,8 @@ DeriveDebug::stub_derive_impl (
{
auto trait_items = vec (stub_debug_fn ());

auto debug = builder.type_path ({"core", "fmt", "Debug"}, true);
auto debug
= builder.type_path ({builder.get_path_start (), "fmt", "Debug"}, true);
auto generics
= setup_impl_generics (name, type_generics, builder.trait_bound (debug));

Expand Down
8 changes: 6 additions & 2 deletions gcc/rust/expand/rust-derive-default.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ DeriveDefault::go (Item &item)
std::unique_ptr<Expr>
DeriveDefault::default_call (std::unique_ptr<Type> &&type)
{
auto default_trait = builder.type_path ({"core", "default", "Default"}, true);
auto default_trait
= builder.type_path ({builder.get_path_start (), "default", "Default"},
true);

auto default_fn
= builder.qualified_path_in_expression (std::move (type), default_trait,
Expand All @@ -69,7 +71,9 @@ DeriveDefault::default_impl (
std::unique_ptr<AssociatedItem> &&default_fn, std::string name,
const std::vector<std::unique_ptr<GenericParam>> &type_generics)
{
auto default_path = builder.type_path ({"core", "default", "Default"}, true);
auto default_path
= builder.type_path ({builder.get_path_start (), "default", "Default"},
true);

auto trait_items = vec (std::move (default_fn));

Expand Down
2 changes: 1 addition & 1 deletion gcc/rust/expand/rust-derive-eq.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace AST {
static TypePath
get_eq_trait_path (Builder &builder)
{
return builder.type_path ({"core", "cmp", "Eq"}, true);
return builder.type_path ({builder.get_path_start (), "cmp", "Eq"}, true);
}

DeriveEq::DeriveEq (location_t loc) : DeriveVisitor (loc) {}
Expand Down
12 changes: 7 additions & 5 deletions gcc/rust/expand/rust-derive-hash.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ DeriveHash::go (Item &item)
std::unique_ptr<Expr>
DeriveHash::hash_call (std::unique_ptr<Expr> &&value)
{
auto hash
= builder.path_in_expression ({"core", "hash", "Hash", "hash"}, true);
auto hash = builder.path_in_expression ({builder.get_path_start (), "hash",
"Hash", "hash"},
true);

return builder.call (ptrify (hash),
vec (std::move (value),
Expand All @@ -63,8 +64,8 @@ DeriveHash::hash_fn (std::unique_ptr<BlockExpr> &&block)
true));

auto params = vec (builder.self_ref_param (), std::move (state_param));
auto bounds = vec (
builder.trait_bound (builder.type_path ({"core", "hash", "Hasher"}, true)));
auto bounds = vec (builder.trait_bound (
builder.type_path ({builder.get_path_start (), "hash", "Hasher"}, true)));
auto generics = vec (
builder.generic_type_param (DeriveHash::state_type, std::move (bounds)));

Expand All @@ -77,7 +78,8 @@ DeriveHash::hash_impl (
std::unique_ptr<AssociatedItem> &&hash_fn, std::string name,
const std::vector<std::unique_ptr<GenericParam>> &type_generics)
{
auto hash_path = builder.type_path ({"core", "hash", "Hash"}, true);
auto hash_path
= builder.type_path ({builder.get_path_start (), "hash", "Hash"}, true);

auto trait_items = vec (std::move (hash_fn));

Expand Down
23 changes: 12 additions & 11 deletions gcc/rust/expand/rust-derive-ord.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ DeriveOrd::cmp_call (std::unique_ptr<Expr> &&self_expr,
std::unique_ptr<Expr> &&other_expr)
{
auto cmp_fn_path = builder.path_in_expression (
{"core", "cmp", trait (ordering), fn (ordering)}, true);
{builder.get_path_start (), "cmp", trait (ordering), fn (ordering)}, true);

return builder.call (ptrify (cmp_fn_path),
vec (builder.ref (std::move (self_expr)),
Expand All @@ -58,10 +58,11 @@ DeriveOrd::cmp_impl (
auto fn = cmp_fn (std::move (fn_block), type_name);

auto trait = ordering == Ordering::Partial ? "PartialOrd" : "Ord";
auto trait_path = builder.type_path ({"core", "cmp", trait}, true);
auto trait_path
= builder.type_path ({builder.get_path_start (), "cmp", trait}, true);

auto trait_bound
= builder.trait_bound (builder.type_path ({"core", "cmp", trait}, true));
auto trait_bound = builder.trait_bound (
builder.type_path ({builder.get_path_start (), "cmp", trait}, true));

auto trait_items = vec (std::move (fn));

Expand All @@ -78,7 +79,8 @@ std::unique_ptr<AssociatedItem>
DeriveOrd::cmp_fn (std::unique_ptr<BlockExpr> &&block, Identifier type_name)
{
// Ordering
auto return_type = builder.type_path ({"core", "cmp", "Ordering"}, true);
auto return_type
= builder.type_path ({builder.get_path_start (), "cmp", "Ordering"}, true);

// In the case of PartialOrd, we return an Option<Ordering>
if (ordering == Ordering::Partial)
Expand All @@ -87,7 +89,7 @@ DeriveOrd::cmp_fn (std::unique_ptr<BlockExpr> &&block, Identifier type_name)

auto generic_seg = builder.type_path_segment_generic (
"Option", GenericArgs ({}, {generic}, {}, loc));
auto core = builder.type_path_segment ("core");
auto core = builder.type_path_segment (builder.get_path_start ());
auto option = builder.type_path_segment ("option");

return_type
Expand All @@ -112,8 +114,8 @@ DeriveOrd::cmp_fn (std::unique_ptr<BlockExpr> &&block, Identifier type_name)
std::unique_ptr<Pattern>
DeriveOrd::make_equal ()
{
std::unique_ptr<Pattern> equal = ptrify (
builder.path_in_expression ({"core", "cmp", "Ordering", "Equal"}, true));
std::unique_ptr<Pattern> equal = ptrify (builder.path_in_expression (
{builder.get_path_start (), "cmp", "Ordering", "Equal"}, true));

// We need to wrap the pattern in Option::Some if we are doing partial
// ordering
Expand Down Expand Up @@ -147,9 +149,8 @@ DeriveOrd::recursive_match (std::vector<SelfOther> &&members)
{
if (members.empty ())
{
std::unique_ptr<Expr> value = ptrify (
builder.path_in_expression ({"core", "cmp", "Ordering", "Equal"},
true));
std::unique_ptr<Expr> value = ptrify (builder.path_in_expression (
{builder.get_path_start (), "cmp", "Ordering", "Equal"}, true));

if (ordering == Ordering::Partial)
value = builder.call (ptrify (builder.path_in_expression (
Expand Down
15 changes: 9 additions & 6 deletions gcc/rust/expand/rust-expand-format-args.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@ static std::unique_ptr<AST::Expr>
format_arg (const AST::Builder &builder, std::unique_ptr<AST::Expr> &&to_format,
const std::string &trait)
{
auto formatter_fn = std::unique_ptr<AST::Expr> (new AST::PathInExpression (
builder.path_in_expression ({"core", "fmt", trait, "fmt"})));
auto formatter_fn = std::unique_ptr<AST::Expr> (
new AST::PathInExpression (builder.path_in_expression (
{builder.get_path_start (), "fmt", trait, "fmt"})));

auto path = std::unique_ptr<AST::Expr> (new AST::PathInExpression (
builder.path_in_expression ({"core", "fmt", "ArgumentV1", "new"})));
auto path = std::unique_ptr<AST::Expr> (
new AST::PathInExpression (builder.path_in_expression (
{builder.get_path_start (), "fmt", "ArgumentV1", "new"})));

auto args = std::vector<std::unique_ptr<AST::Expr>> ();
args.emplace_back (std::move (to_format));
Expand Down Expand Up @@ -122,8 +124,9 @@ expand_format_args (AST::FormatArgs &fmt,
auto pieces = builder.ref (builder.array (std::move (static_pieces)));
auto args_slice = builder.ref (builder.array (std::move (args_array)));

auto final_path = std::make_unique<AST::PathInExpression> (
builder.path_in_expression ({"core", "fmt", "Arguments", "new_v1"}));
auto final_path
= std::make_unique<AST::PathInExpression> (builder.path_in_expression (
{builder.get_path_start (), "fmt", "Arguments", "new_v1"}));
auto final_args = std::vector<std::unique_ptr<AST::Expr>> ();
final_args.emplace_back (std::move (pieces));
final_args.emplace_back (std::move (args_slice));
Expand Down
4 changes: 4 additions & 0 deletions gcc/rust/lang.opt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,4 +237,8 @@ frust-unused-check-2.0
Rust Var(flag_unused_check_2_0)
Use the new unused variable check implementation.

frust-compile-core
Copy link
Member

@P-E-P P-E-P Jan 20, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could maybe rely on #[no_core] instead.

Rust Var(flag_compile_core)
Tell the compiler that we are currently compiling the core library

; This comment is to ensure we retain the blank line above.