diff options
author | Owen Avery <powerboat9.gamer@gmail.com> | 2023-07-10 15:42:49 -0400 |
---|---|---|
committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2024-01-16 18:55:56 +0100 |
commit | d991a3f15f64d3a16cce0866508bb76d87b9627c (patch) | |
tree | 05089b03dde35a66eba255f7b8392c35a08508e8 /gcc/rust/hir/tree/rust-hir.h | |
parent | ad14f866184f91afa9a0a6e73ee14b06ce017037 (diff) | |
download | gcc-d991a3f15f64d3a16cce0866508bb76d87b9627c.zip gcc-d991a3f15f64d3a16cce0866508bb76d87b9627c.tar.gz gcc-d991a3f15f64d3a16cce0866508bb76d87b9627c.tar.bz2 |
gccrs: Replace some usages of Location with location_t
gcc/rust/ChangeLog:
* ast/rust-ast-collector.cc: Replace Location with location_t.
* ast/rust-ast.cc: Likewise.
* ast/rust-ast.h: Likewise.
* ast/rust-expr.h: Likewise.
* ast/rust-item.h: Likewise.
* ast/rust-macro.h: Likewise.
* ast/rust-path.cc: Likewise.
* ast/rust-path.h: Likewise.
* ast/rust-pattern.h: Likewise.
* ast/rust-stmt.h: Likewise.
* ast/rust-type.h: Likewise.
* backend/rust-compile-base.cc: Likewise.
* backend/rust-compile-base.h: Likewise.
* backend/rust-compile-block.cc: Likewise.
* backend/rust-compile-expr.cc: Likewise.
* backend/rust-compile-expr.h: Likewise.
* backend/rust-compile-fnparam.cc: Likewise.
* backend/rust-compile-fnparam.h: Likewise.
* backend/rust-compile-intrinsic.cc: Likewise.
* backend/rust-compile-pattern.cc: Likewise.
* backend/rust-compile-resolve-path.h: Likewise.
* backend/rust-compile.cc: Likewise.
* checks/errors/rust-const-checker.cc: Likewise.
* checks/errors/rust-const-checker.h: Likewise.
* checks/errors/rust-unsafe-checker.cc: Likewise.
* checks/errors/rust-unsafe-checker.h: Likewise.
* expand/rust-macro-builtins.cc: Likewise.
* expand/rust-macro-expand.h: Likewise.
* hir/rust-ast-lower-base.h: Likewise.
* hir/rust-ast-lower-implitem.h: Likewise.
* hir/rust-ast-lower-item.cc: Likewise.
* hir/tree/rust-hir-expr.h: Likewise.
* hir/tree/rust-hir-item.h: Likewise.
* hir/tree/rust-hir-path.h: Likewise.
* hir/tree/rust-hir-pattern.h: Likewise.
* hir/tree/rust-hir-stmt.h: Likewise.
* hir/tree/rust-hir-type.h: Likewise.
* hir/tree/rust-hir.cc: Likewise.
* hir/tree/rust-hir.h: Likewise.
* lex/rust-token.h: Likewise.
* metadata/rust-extern-crate.cc: Likewise.
* metadata/rust-extern-crate.h: Likewise.
* parse/rust-parse-impl.h: Likewise.
* parse/rust-parse.h: Likewise.
* resolve/rust-ast-resolve-expr.cc: Likewise.
* resolve/rust-ast-resolve-implitem.h: Likewise.
* resolve/rust-ast-resolve-pattern.h: Likewise.
* resolve/rust-ast-resolve-stmt.h: Likewise.
* resolve/rust-ast-resolve-toplevel.h: Likewise.
* resolve/rust-ast-resolve-type.h: Likewise.
* resolve/rust-name-resolver.cc: Likewise.
* resolve/rust-name-resolver.h: Likewise.
* rust-diagnostics.cc: Likewise.
* rust-diagnostics.h: Likewise.
* rust-gcc.cc: Likewise.
* rust-session-manager.cc: Likewise.
* rust-session-manager.h: Likewise.
* typecheck/rust-casts.cc: Likewise.
* typecheck/rust-casts.h: Likewise.
* typecheck/rust-coercion.cc: Likewise.
* typecheck/rust-coercion.h: Likewise.
* typecheck/rust-hir-path-probe.cc: Likewise.
* typecheck/rust-hir-path-probe.h: Likewise.
* typecheck/rust-hir-trait-reference.cc: Likewise.
* typecheck/rust-hir-trait-reference.h: Likewise.
* typecheck/rust-hir-trait-resolve.cc: Likewise.
* typecheck/rust-hir-type-check-base.cc: Likewise.
* typecheck/rust-hir-type-check-base.h: Likewise.
* typecheck/rust-hir-type-check-item.cc: Likewise.
* typecheck/rust-hir-type-check-item.h: Likewise.
* typecheck/rust-hir-type-check-path.cc: Likewise.
* typecheck/rust-hir-type-check-pattern.cc: Likewise.
* typecheck/rust-hir-type-check-pattern.h: Likewise.
* typecheck/rust-hir-type-check-type.cc: Likewise.
* typecheck/rust-hir-type-check-type.h: Likewise.
* typecheck/rust-hir-type-check.cc: Likewise.
* typecheck/rust-hir-type-check.h: Likewise.
* typecheck/rust-substitution-mapper.cc: Likewise.
* typecheck/rust-substitution-mapper.h: Likewise.
* typecheck/rust-type-util.cc: Likewise.
* typecheck/rust-typecheck-context.cc: Likewise.
* typecheck/rust-tyty-bounds.cc: Likewise.
* typecheck/rust-tyty-call.h: Likewise.
* typecheck/rust-tyty-subst.cc: Likewise.
* typecheck/rust-tyty-subst.h: Likewise.
* typecheck/rust-tyty-util.cc: Likewise.
* typecheck/rust-tyty-util.h: Likewise.
* typecheck/rust-tyty.cc: Likewise.
* typecheck/rust-tyty.h: Likewise.
* typecheck/rust-unify.cc: Likewise.
* typecheck/rust-unify.h: Likewise.
* util/rust-hir-map.cc: Likewise.
* util/rust-hir-map.h: Likewise.
* util/rust-identifier.h: Likewise.
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
Diffstat (limited to 'gcc/rust/hir/tree/rust-hir.h')
-rw-r--r-- | gcc/rust/hir/tree/rust-hir.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gcc/rust/hir/tree/rust-hir.h b/gcc/rust/hir/tree/rust-hir.h index 578e126..c5a027a 100644 --- a/gcc/rust/hir/tree/rust-hir.h +++ b/gcc/rust/hir/tree/rust-hir.h @@ -467,7 +467,7 @@ public: virtual Location get_locus () const { return locus; } protected: - Type (Analysis::NodeMapping mappings, Location locus) + Type (Analysis::NodeMapping mappings, location_t locus) : mappings (mappings), locus (locus) {} @@ -475,7 +475,7 @@ protected: virtual Type *clone_type_impl () const = 0; Analysis::NodeMapping mappings; - Location locus; + location_t locus; }; // A type without parentheses? - abstract @@ -489,7 +489,7 @@ public: } protected: - TypeNoBounds (Analysis::NodeMapping mappings, Location locus) + TypeNoBounds (Analysis::NodeMapping mappings, location_t locus) : Type (mappings, locus) {} @@ -544,13 +544,13 @@ class Lifetime : public TypeParamBound private: AST::Lifetime::LifetimeType lifetime_type; std::string lifetime_name; - Location locus; + location_t locus; Analysis::NodeMapping mappings; public: // Constructor Lifetime (Analysis::NodeMapping mapping, AST::Lifetime::LifetimeType type, - std::string name, Location locus) + std::string name, location_t locus) : lifetime_type (type), lifetime_name (std::move (name)), locus (locus), mappings (mapping) {} @@ -654,7 +654,7 @@ class LifetimeParam : public GenericParam // std::unique_ptr<Attribute> outer_attr; AST::Attribute outer_attr; - Location locus; + location_t locus; public: Lifetime get_lifetime () { return lifetime; } @@ -670,7 +670,7 @@ public: // Constructor LifetimeParam (Analysis::NodeMapping mappings, Lifetime lifetime, - Location locus = UNDEF_LOCATION, + location_t locus = UNDEF_LOCATION, std::vector<Lifetime> lifetime_bounds = std::vector<Lifetime> (), AST::Attribute outer_attr = AST::Attribute::create_empty ()) @@ -725,7 +725,7 @@ class ConstGenericParam : public GenericParam public: ConstGenericParam (std::string name, std::unique_ptr<Type> type, std::unique_ptr<Expr> default_expression, - Analysis::NodeMapping mapping, Location locus) + Analysis::NodeMapping mapping, location_t locus) : GenericParam (mapping, GenericKind::CONST), name (std::move (name)), type (std::move (type)), default_expression (std::move (default_expression)), locus (locus) @@ -772,7 +772,7 @@ private: /* Optional - can be a null pointer if there is no default expression */ std::unique_ptr<Expr> default_expression; - Location locus; + location_t locus; }; // Item used in trait declarations - abstract base class |