From 551e3af9d09a03aaa246cac46b98124bc10835ba Mon Sep 17 00:00:00 2001
From: Laurenz <laurmaedje@gmail.com>
Date: Thu, 8 Jul 2021 21:16:16 +0200
Subject: Replace using with from

---
 src/syntax/expr.rs  | 4 ++--
 src/syntax/token.rs | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/syntax')

diff --git a/src/syntax/expr.rs b/src/syntax/expr.rs
index f5b79122..c4462ff8 100644
--- a/src/syntax/expr.rs
+++ b/src/syntax/expr.rs
@@ -59,7 +59,7 @@ pub enum Expr {
     While(WhileExpr),
     /// A for loop expression: `for x in y { z }`.
     For(ForExpr),
-    /// An import expression: `import "utils.typ" using a, b, c`.
+    /// An import expression: `import a, b, c from "utils.typ"`.
     Import(ImportExpr),
     /// An include expression: `include "chapter1.typ"`.
     Include(IncludeExpr),
@@ -466,7 +466,7 @@ pub struct LetExpr {
     pub init: Option<Box<Expr>>,
 }
 
-/// An import expression: `import "utils.typ" using a, b, c`.
+/// An import expression: `import a, b, c from "utils.typ"`.
 #[derive(Debug, Clone, PartialEq)]
 pub struct ImportExpr {
     /// The source code location.
diff --git a/src/syntax/token.rs b/src/syntax/token.rs
index 425dac10..c14cf9f7 100644
--- a/src/syntax/token.rs
+++ b/src/syntax/token.rs
@@ -101,8 +101,8 @@ pub enum Token<'s> {
     Import,
     /// The `include` keyword.
     Include,
-    /// The `using` keyword.
-    Using,
+    /// The `from` keyword.
+    From,
     /// One or more whitespace characters.
     ///
     /// The contained `usize` denotes the number of newlines that were contained
@@ -254,7 +254,7 @@ impl<'s> Token<'s> {
             Self::Return => "keyword `return`",
             Self::Import => "keyword `import`",
             Self::Include => "keyword `include`",
-            Self::Using => "keyword `using`",
+            Self::From => "keyword `from`",
             Self::Space(_) => "space",
             Self::Text(_) => "text",
             Self::UnicodeEscape(_) => "unicode escape sequence",
-- 
cgit v1.2.3